refactor cache module based on new hash table and reference count management module
This commit is contained in:
parent
98b4296b15
commit
8504daeadc
File diff suppressed because it is too large
Load Diff
|
@ -484,7 +484,7 @@ int tscProcessLocalCmd(SSqlObj *pSql) {
|
||||||
pSql->res.qhandle = 0x1;
|
pSql->res.qhandle = 0x1;
|
||||||
pSql->res.numOfRows = 0;
|
pSql->res.numOfRows = 0;
|
||||||
} else if (pCmd->command == TSDB_SQL_RESET_CACHE) {
|
} else if (pCmd->command == TSDB_SQL_RESET_CACHE) {
|
||||||
taosClearDataCache(tscCacheHandle);
|
taosCacheEmpty(tscCacheHandle);
|
||||||
} else if (pCmd->command == TSDB_SQL_SERV_VERSION) {
|
} else if (pCmd->command == TSDB_SQL_SERV_VERSION) {
|
||||||
tscProcessServerVer(pSql);
|
tscProcessServerVer(pSql);
|
||||||
} else if (pCmd->command == TSDB_SQL_CLI_VERSION) {
|
} else if (pCmd->command == TSDB_SQL_CLI_VERSION) {
|
||||||
|
|
|
@ -182,7 +182,6 @@ int tscSendMsgToServer(SSqlObj *pSql) {
|
||||||
}
|
}
|
||||||
|
|
||||||
pSql->ipList->ip[0] = inet_addr("192.168.0.1");
|
pSql->ipList->ip[0] = inet_addr("192.168.0.1");
|
||||||
SSqlCmd* pCmd = &pSql->cmd;
|
|
||||||
|
|
||||||
if (pSql->cmd.command < TSDB_SQL_MGMT) {
|
if (pSql->cmd.command < TSDB_SQL_MGMT) {
|
||||||
pSql->ipList->port = tsDnodeShellPort;
|
pSql->ipList->port = tsDnodeShellPort;
|
||||||
|
@ -2641,7 +2640,7 @@ int tscProcessMeterMetaRsp(SSqlObj *pSql) {
|
||||||
SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfo(&pSql->cmd, 0, 0);
|
SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfo(&pSql->cmd, 0, 0);
|
||||||
assert(pMeterMetaInfo->pMeterMeta == NULL);
|
assert(pMeterMetaInfo->pMeterMeta == NULL);
|
||||||
|
|
||||||
pMeterMetaInfo->pMeterMeta = (STableMeta *)taosAddDataIntoCache(tscCacheHandle, pMeterMetaInfo->name, (char *)pMeta,
|
pMeterMetaInfo->pMeterMeta = (STableMeta *)taosCachePut(tscCacheHandle, pMeterMetaInfo->name, (char *)pMeta,
|
||||||
pMeta->contLen, tsMeterMetaKeepTimer);
|
pMeta->contLen, tsMeterMetaKeepTimer);
|
||||||
// todo handle out of memory case
|
// todo handle out of memory case
|
||||||
if (pMeterMetaInfo->pMeterMeta == NULL) return 0;
|
if (pMeterMetaInfo->pMeterMeta == NULL) return 0;
|
||||||
|
@ -2750,7 +2749,7 @@ int tscProcessMultiMeterMetaRsp(SSqlObj *pSql) {
|
||||||
int32_t size = (int32_t)(rsp - ((char *)pMeta)); // Consistent with STableMeta in cache
|
int32_t size = (int32_t)(rsp - ((char *)pMeta)); // Consistent with STableMeta in cache
|
||||||
|
|
||||||
pMeta->index = 0;
|
pMeta->index = 0;
|
||||||
(void)taosAddDataIntoCache(tscCacheHandle, pMeta->tableId, (char *)pMeta, size, tsMeterMetaKeepTimer);
|
(void)taosCachePut(tscCacheHandle, pMeta->tableId, (char *)pMeta, size, tsMeterMetaKeepTimer);
|
||||||
}
|
}
|
||||||
|
|
||||||
pSql->res.code = TSDB_CODE_SUCCESS;
|
pSql->res.code = TSDB_CODE_SUCCESS;
|
||||||
|
@ -2857,9 +2856,9 @@ int tscProcessMetricMetaRsp(SSqlObj *pSql) {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// release the used metricmeta
|
// release the used metricmeta
|
||||||
taosRemoveDataFromCache(tscCacheHandle, (void **)&(pMeterMetaInfo->pMetricMeta), false);
|
taosCacheRelease(tscCacheHandle, (void **)&(pMeterMetaInfo->pMetricMeta), false);
|
||||||
|
|
||||||
pMeterMetaInfo->pMetricMeta = (SSuperTableMeta *)taosAddDataIntoCache(tscCacheHandle, name, (char *)metricMetaList[i],
|
pMeterMetaInfo->pMetricMeta = (SSuperTableMeta *)taosCachePut(tscCacheHandle, name, (char *)metricMetaList[i],
|
||||||
sizes[i], tsMetricMetaKeepTimer);
|
sizes[i], tsMetricMetaKeepTimer);
|
||||||
tfree(metricMetaList[i]);
|
tfree(metricMetaList[i]);
|
||||||
|
|
||||||
|
@ -2917,11 +2916,11 @@ int tscProcessShowRsp(SSqlObj *pSql) {
|
||||||
key[0] = pCmd->msgType + 'a';
|
key[0] = pCmd->msgType + 'a';
|
||||||
strcpy(key + 1, "showlist");
|
strcpy(key + 1, "showlist");
|
||||||
|
|
||||||
taosRemoveDataFromCache(tscCacheHandle, (void *)&(pMeterMetaInfo->pMeterMeta), false);
|
taosCacheRelease(tscCacheHandle, (void *)&(pMeterMetaInfo->pMeterMeta), false);
|
||||||
|
|
||||||
int32_t size = pMeta->numOfColumns * sizeof(SSchema) + sizeof(STableMeta);
|
int32_t size = pMeta->numOfColumns * sizeof(SSchema) + sizeof(STableMeta);
|
||||||
pMeterMetaInfo->pMeterMeta =
|
pMeterMetaInfo->pMeterMeta =
|
||||||
(STableMeta *)taosAddDataIntoCache(tscCacheHandle, key, (char *)pMeta, size, tsMeterMetaKeepTimer);
|
(STableMeta *)taosCachePut(tscCacheHandle, key, (char *)pMeta, size, tsMeterMetaKeepTimer);
|
||||||
pCmd->numOfCols = pQueryInfo->fieldsInfo.numOfOutputCols;
|
pCmd->numOfCols = pQueryInfo->fieldsInfo.numOfOutputCols;
|
||||||
SSchema *pMeterSchema = tsGetSchema(pMeterMetaInfo->pMeterMeta);
|
SSchema *pMeterSchema = tsGetSchema(pMeterMetaInfo->pMeterMeta);
|
||||||
|
|
||||||
|
@ -2975,14 +2974,14 @@ int tscProcessUseDbRsp(SSqlObj *pSql) {
|
||||||
}
|
}
|
||||||
|
|
||||||
int tscProcessDropDbRsp(SSqlObj *UNUSED_PARAM(pSql)) {
|
int tscProcessDropDbRsp(SSqlObj *UNUSED_PARAM(pSql)) {
|
||||||
taosClearDataCache(tscCacheHandle);
|
taosCacheEmpty(tscCacheHandle);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
int tscProcessDropTableRsp(SSqlObj *pSql) {
|
int tscProcessDropTableRsp(SSqlObj *pSql) {
|
||||||
SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfo(&pSql->cmd, 0, 0);
|
SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfo(&pSql->cmd, 0, 0);
|
||||||
|
|
||||||
STableMeta *pMeterMeta = taosGetDataFromCache(tscCacheHandle, pMeterMetaInfo->name);
|
STableMeta *pMeterMeta = taosCacheAcquireByName(tscCacheHandle, pMeterMetaInfo->name);
|
||||||
if (pMeterMeta == NULL) {
|
if (pMeterMeta == NULL) {
|
||||||
/* not in cache, abort */
|
/* not in cache, abort */
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -2996,11 +2995,11 @@ int tscProcessDropTableRsp(SSqlObj *pSql) {
|
||||||
* instead.
|
* instead.
|
||||||
*/
|
*/
|
||||||
tscTrace("%p force release metermeta after drop table:%s", pSql, pMeterMetaInfo->name);
|
tscTrace("%p force release metermeta after drop table:%s", pSql, pMeterMetaInfo->name);
|
||||||
taosRemoveDataFromCache(tscCacheHandle, (void **)&pMeterMeta, true);
|
taosCacheRelease(tscCacheHandle, (void **)&pMeterMeta, true);
|
||||||
|
|
||||||
if (pMeterMetaInfo->pMeterMeta) {
|
if (pMeterMetaInfo->pMeterMeta) {
|
||||||
taosRemoveDataFromCache(tscCacheHandle, (void **)&(pMeterMetaInfo->pMeterMeta), true);
|
taosCacheRelease(tscCacheHandle, (void **)&(pMeterMetaInfo->pMeterMeta), true);
|
||||||
taosRemoveDataFromCache(tscCacheHandle, (void **)&(pMeterMetaInfo->pMetricMeta), true);
|
taosCacheRelease(tscCacheHandle, (void **)&(pMeterMetaInfo->pMetricMeta), true);
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -3009,23 +3008,23 @@ int tscProcessDropTableRsp(SSqlObj *pSql) {
|
||||||
int tscProcessAlterTableMsgRsp(SSqlObj *pSql) {
|
int tscProcessAlterTableMsgRsp(SSqlObj *pSql) {
|
||||||
SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfo(&pSql->cmd, 0, 0);
|
SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfo(&pSql->cmd, 0, 0);
|
||||||
|
|
||||||
STableMeta *pMeterMeta = taosGetDataFromCache(tscCacheHandle, pMeterMetaInfo->name);
|
STableMeta *pMeterMeta = taosCacheAcquireByName(tscCacheHandle, pMeterMetaInfo->name);
|
||||||
if (pMeterMeta == NULL) { /* not in cache, abort */
|
if (pMeterMeta == NULL) { /* not in cache, abort */
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
tscTrace("%p force release metermeta in cache after alter-table: %s", pSql, pMeterMetaInfo->name);
|
tscTrace("%p force release metermeta in cache after alter-table: %s", pSql, pMeterMetaInfo->name);
|
||||||
taosRemoveDataFromCache(tscCacheHandle, (void **)&pMeterMeta, true);
|
taosCacheRelease(tscCacheHandle, (void **)&pMeterMeta, true);
|
||||||
|
|
||||||
if (pMeterMetaInfo->pMeterMeta) {
|
if (pMeterMetaInfo->pMeterMeta) {
|
||||||
bool isSuperTable = UTIL_METER_IS_SUPERTABLE(pMeterMetaInfo);
|
bool isSuperTable = UTIL_METER_IS_SUPERTABLE(pMeterMetaInfo);
|
||||||
|
|
||||||
taosRemoveDataFromCache(tscCacheHandle, (void **)&(pMeterMetaInfo->pMeterMeta), true);
|
taosCacheRelease(tscCacheHandle, (void **)&(pMeterMetaInfo->pMeterMeta), true);
|
||||||
taosRemoveDataFromCache(tscCacheHandle, (void **)&(pMeterMetaInfo->pMetricMeta), true);
|
taosCacheRelease(tscCacheHandle, (void **)&(pMeterMetaInfo->pMetricMeta), true);
|
||||||
|
|
||||||
if (isSuperTable) { // if it is a super table, reset whole query cache
|
if (isSuperTable) { // if it is a super table, reset whole query cache
|
||||||
tscTrace("%p reset query cache since table:%s is stable", pSql, pMeterMetaInfo->name);
|
tscTrace("%p reset query cache since table:%s is stable", pSql, pMeterMetaInfo->name);
|
||||||
taosClearDataCache(tscCacheHandle);
|
taosCacheEmpty(tscCacheHandle);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3151,7 +3150,7 @@ static int32_t doGetMeterMetaFromServer(SSqlObj *pSql, SMeterMetaInfo *pMeterMet
|
||||||
* Transfer the ownership of metermeta to the new object, instead of invoking the release/acquire routine
|
* Transfer the ownership of metermeta to the new object, instead of invoking the release/acquire routine
|
||||||
*/
|
*/
|
||||||
if (code == TSDB_CODE_SUCCESS) {
|
if (code == TSDB_CODE_SUCCESS) {
|
||||||
pMeterMetaInfo->pMeterMeta = taosTransferDataInCache(tscCacheHandle, (void**) &pNewMeterMetaInfo->pMeterMeta);
|
pMeterMetaInfo->pMeterMeta = taosCacheTransfer(tscCacheHandle, (void**) &pNewMeterMetaInfo->pMeterMeta);
|
||||||
assert(pMeterMetaInfo->pMeterMeta != NULL);
|
assert(pMeterMetaInfo->pMeterMeta != NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3177,10 +3176,10 @@ int tscGetMeterMeta(SSqlObj *pSql, SMeterMetaInfo *pMeterMetaInfo) {
|
||||||
|
|
||||||
// If this SMeterMetaInfo owns a metermeta, release it first
|
// If this SMeterMetaInfo owns a metermeta, release it first
|
||||||
if (pMeterMetaInfo->pMeterMeta != NULL) {
|
if (pMeterMetaInfo->pMeterMeta != NULL) {
|
||||||
taosRemoveDataFromCache(tscCacheHandle, (void **)&(pMeterMetaInfo->pMeterMeta), false);
|
taosCacheRelease(tscCacheHandle, (void **)&(pMeterMetaInfo->pMeterMeta), false);
|
||||||
}
|
}
|
||||||
|
|
||||||
pMeterMetaInfo->pMeterMeta = (STableMeta *)taosGetDataFromCache(tscCacheHandle, pMeterMetaInfo->name);
|
pMeterMetaInfo->pMeterMeta = (STableMeta *)taosCacheAcquireByName(tscCacheHandle, pMeterMetaInfo->name);
|
||||||
if (pMeterMetaInfo->pMeterMeta != NULL) {
|
if (pMeterMetaInfo->pMeterMeta != NULL) {
|
||||||
STableMeta *pMeterMeta = pMeterMetaInfo->pMeterMeta;
|
STableMeta *pMeterMeta = pMeterMetaInfo->pMeterMeta;
|
||||||
|
|
||||||
|
@ -3244,7 +3243,7 @@ int tscRenewMeterMeta(SSqlObj *pSql, char *tableId) {
|
||||||
}
|
}
|
||||||
|
|
||||||
tscWaitingForCreateTable(pCmd);
|
tscWaitingForCreateTable(pCmd);
|
||||||
taosRemoveDataFromCache(tscCacheHandle, (void **)&(pMeterMetaInfo->pMeterMeta), true);
|
taosCacheRelease(tscCacheHandle, (void **)&(pMeterMetaInfo->pMeterMeta), true);
|
||||||
|
|
||||||
code = doGetMeterMetaFromServer(pSql, pMeterMetaInfo); // todo ??
|
code = doGetMeterMetaFromServer(pSql, pMeterMetaInfo); // todo ??
|
||||||
} else {
|
} else {
|
||||||
|
@ -3278,9 +3277,9 @@ int tscGetMetricMeta(SSqlObj *pSql, int32_t clauseIndex) {
|
||||||
SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, i);
|
SMeterMetaInfo *pMeterMetaInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, i);
|
||||||
tscGetMetricMetaCacheKey(pQueryInfo, tagstr, pMeterMetaInfo->pMeterMeta->uid);
|
tscGetMetricMetaCacheKey(pQueryInfo, tagstr, pMeterMetaInfo->pMeterMeta->uid);
|
||||||
|
|
||||||
taosRemoveDataFromCache(tscCacheHandle, (void **)&(pMeterMetaInfo->pMetricMeta), false);
|
taosCacheRelease(tscCacheHandle, (void **)&(pMeterMetaInfo->pMetricMeta), false);
|
||||||
|
|
||||||
SSuperTableMeta *ppMeta = (SSuperTableMeta *)taosGetDataFromCache(tscCacheHandle, tagstr);
|
SSuperTableMeta *ppMeta = (SSuperTableMeta *)taosCacheAcquireByName(tscCacheHandle, tagstr);
|
||||||
if (ppMeta == NULL) {
|
if (ppMeta == NULL) {
|
||||||
required = true;
|
required = true;
|
||||||
break;
|
break;
|
||||||
|
@ -3308,7 +3307,7 @@ int tscGetMetricMeta(SSqlObj *pSql, int32_t clauseIndex) {
|
||||||
for (int32_t i = 0; i < pQueryInfo->numOfTables; ++i) {
|
for (int32_t i = 0; i < pQueryInfo->numOfTables; ++i) {
|
||||||
SMeterMetaInfo *pMMInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, i);
|
SMeterMetaInfo *pMMInfo = tscGetMeterMetaInfoFromQueryInfo(pQueryInfo, i);
|
||||||
|
|
||||||
STableMeta *pMeterMeta = taosGetDataFromCache(tscCacheHandle, pMMInfo->name);
|
STableMeta *pMeterMeta = taosCacheAcquireByName(tscCacheHandle, pMMInfo->name);
|
||||||
tscAddMeterMetaInfo(pNewQueryInfo, pMMInfo->name, pMeterMeta, NULL, pMMInfo->numOfTags, pMMInfo->tagColumnIndex);
|
tscAddMeterMetaInfo(pNewQueryInfo, pMMInfo->name, pMeterMeta, NULL, pMMInfo->numOfTags, pMMInfo->tagColumnIndex);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3353,8 +3352,8 @@ int tscGetMetricMeta(SSqlObj *pSql, int32_t clauseIndex) {
|
||||||
printf("create metric key:%s, index:%d\n", tagstr, i);
|
printf("create metric key:%s, index:%d\n", tagstr, i);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
taosRemoveDataFromCache(tscCacheHandle, (void **)&(pMeterMetaInfo->pMetricMeta), false);
|
taosCacheRelease(tscCacheHandle, (void **)&(pMeterMetaInfo->pMetricMeta), false);
|
||||||
pMeterMetaInfo->pMetricMeta = (SSuperTableMeta *)taosGetDataFromCache(tscCacheHandle, tagstr);
|
pMeterMetaInfo->pMetricMeta = (SSuperTableMeta *) taosCacheAcquireByName(tscCacheHandle, tagstr);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -371,7 +371,7 @@ TAOS_RES *taos_consume(TAOS_SUB *tsub) {
|
||||||
pSql->sqlstr = NULL;
|
pSql->sqlstr = NULL;
|
||||||
taos_free_result_imp(pSql, 0);
|
taos_free_result_imp(pSql, 0);
|
||||||
pSql->sqlstr = sqlstr;
|
pSql->sqlstr = sqlstr;
|
||||||
taosClearDataCache(tscCacheHandle);
|
taosCacheEmpty(tscCacheHandle);
|
||||||
if (!tscUpdateSubscription(pSub->taos, pSub)) return NULL;
|
if (!tscUpdateSubscription(pSub->taos, pSub)) return NULL;
|
||||||
tscTrace("meter synchronization completed");
|
tscTrace("meter synchronization completed");
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -186,7 +186,7 @@ void taos_init_imp() {
|
||||||
refreshTime = refreshTime > 2 ? 2 : refreshTime;
|
refreshTime = refreshTime > 2 ? 2 : refreshTime;
|
||||||
refreshTime = refreshTime < 1 ? 1 : refreshTime;
|
refreshTime = refreshTime < 1 ? 1 : refreshTime;
|
||||||
|
|
||||||
if (tscCacheHandle == NULL) tscCacheHandle = taosInitDataCache(tsMaxMeterConnections / 2, tscTmr, refreshTime);
|
if (tscCacheHandle == NULL) tscCacheHandle = taosCacheInit(tscTmr, refreshTime);
|
||||||
|
|
||||||
tscConnCache = taosOpenConnCache(tsMaxMeterConnections * 2, NULL/*taosCloseRpcConn*/, tscTmr, tsShellActivityTimer * 1000);
|
tscConnCache = taosOpenConnCache(tsMaxMeterConnections * 2, NULL/*taosCloseRpcConn*/, tscTmr, tsShellActivityTimer * 1000);
|
||||||
|
|
||||||
|
|
|
@ -505,7 +505,7 @@ void tscDestroyDataBlock(STableDataBlocks* pDataBlock) {
|
||||||
tfree(pDataBlock->params);
|
tfree(pDataBlock->params);
|
||||||
|
|
||||||
// free the refcount for metermeta
|
// free the refcount for metermeta
|
||||||
taosRemoveDataFromCache(tscCacheHandle, (void**)&(pDataBlock->pMeterMeta), false);
|
taosCacheRelease(tscCacheHandle, (void**)&(pDataBlock->pMeterMeta), false);
|
||||||
tfree(pDataBlock);
|
tfree(pDataBlock);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -589,9 +589,9 @@ int32_t tscCopyDataBlockToPayload(SSqlObj* pSql, STableDataBlocks* pDataBlock) {
|
||||||
// set the correct metermeta object, the metermeta has been locked in pDataBlocks, so it must be in the cache
|
// set the correct metermeta object, the metermeta has been locked in pDataBlocks, so it must be in the cache
|
||||||
if (pMeterMetaInfo->pMeterMeta != pDataBlock->pMeterMeta) {
|
if (pMeterMetaInfo->pMeterMeta != pDataBlock->pMeterMeta) {
|
||||||
strcpy(pMeterMetaInfo->name, pDataBlock->tableId);
|
strcpy(pMeterMetaInfo->name, pDataBlock->tableId);
|
||||||
taosRemoveDataFromCache(tscCacheHandle, (void**)&(pMeterMetaInfo->pMeterMeta), false);
|
taosCacheRelease(tscCacheHandle, (void**)&(pMeterMetaInfo->pMeterMeta), false);
|
||||||
|
|
||||||
pMeterMetaInfo->pMeterMeta = taosTransferDataInCache(tscCacheHandle, (void**)&pDataBlock->pMeterMeta);
|
pMeterMetaInfo->pMeterMeta = taosCacheTransfer(tscCacheHandle, (void**)&pDataBlock->pMeterMeta);
|
||||||
} else {
|
} else {
|
||||||
assert(strncmp(pMeterMetaInfo->name, pDataBlock->tableId, tListLen(pDataBlock->tableId)) == 0);
|
assert(strncmp(pMeterMetaInfo->name, pDataBlock->tableId, tListLen(pDataBlock->tableId)) == 0);
|
||||||
}
|
}
|
||||||
|
@ -665,7 +665,7 @@ int32_t tscCreateDataBlock(size_t initialSize, int32_t rowSize, int32_t startOff
|
||||||
* due to operation such as drop database. So here we add the reference count directly instead of invoke
|
* due to operation such as drop database. So here we add the reference count directly instead of invoke
|
||||||
* taosGetDataFromCache, which may return NULL value.
|
* taosGetDataFromCache, which may return NULL value.
|
||||||
*/
|
*/
|
||||||
dataBuf->pMeterMeta = taosGetDataFromExists(tscCacheHandle, pMeterMeta);
|
dataBuf->pMeterMeta = taosCacheAcquireByData(tscCacheHandle, pMeterMeta);
|
||||||
assert(initialSize > 0 && pMeterMeta != NULL && dataBuf->pMeterMeta != NULL);
|
assert(initialSize > 0 && pMeterMeta != NULL && dataBuf->pMeterMeta != NULL);
|
||||||
|
|
||||||
*dataBlocks = dataBuf;
|
*dataBlocks = dataBuf;
|
||||||
|
@ -1940,8 +1940,8 @@ void tscClearMeterMetaInfo(SMeterMetaInfo* pMeterMetaInfo, bool removeFromCache)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
taosRemoveDataFromCache(tscCacheHandle, (void**)&(pMeterMetaInfo->pMeterMeta), removeFromCache);
|
taosCacheRelease(tscCacheHandle, (void**)&(pMeterMetaInfo->pMeterMeta), removeFromCache);
|
||||||
taosRemoveDataFromCache(tscCacheHandle, (void**)&(pMeterMetaInfo->pMetricMeta), removeFromCache);
|
taosCacheRelease(tscCacheHandle, (void**)&(pMeterMetaInfo->pMetricMeta), removeFromCache);
|
||||||
}
|
}
|
||||||
|
|
||||||
void tscResetForNextRetrieve(SSqlRes* pRes) {
|
void tscResetForNextRetrieve(SSqlRes* pRes) {
|
||||||
|
@ -2071,16 +2071,16 @@ SSqlObj* createSubqueryObj(SSqlObj* pSql, int16_t tableIndex, void (*fp)(), void
|
||||||
SMeterMetaInfo* pFinalInfo = NULL;
|
SMeterMetaInfo* pFinalInfo = NULL;
|
||||||
|
|
||||||
if (pPrevSql == NULL) {
|
if (pPrevSql == NULL) {
|
||||||
STableMeta* pMeterMeta = taosGetDataFromCache(tscCacheHandle, name);
|
STableMeta* pMeterMeta = taosCacheAcquireByName(tscCacheHandle, name);
|
||||||
SSuperTableMeta* pMetricMeta = taosGetDataFromCache(tscCacheHandle, key);
|
SSuperTableMeta* pMetricMeta = taosCacheAcquireByName(tscCacheHandle, key);
|
||||||
|
|
||||||
pFinalInfo = tscAddMeterMetaInfo(pNewQueryInfo, name, pMeterMeta, pMetricMeta, pMeterMetaInfo->numOfTags,
|
pFinalInfo = tscAddMeterMetaInfo(pNewQueryInfo, name, pMeterMeta, pMetricMeta, pMeterMetaInfo->numOfTags,
|
||||||
pMeterMetaInfo->tagColumnIndex);
|
pMeterMetaInfo->tagColumnIndex);
|
||||||
} else { // transfer the ownership of pMeterMeta/pMetricMeta to the newly create sql object.
|
} else { // transfer the ownership of pMeterMeta/pMetricMeta to the newly create sql object.
|
||||||
SMeterMetaInfo* pPrevInfo = tscGetMeterMetaInfo(&pPrevSql->cmd, pPrevSql->cmd.clauseIndex, 0);
|
SMeterMetaInfo* pPrevInfo = tscGetMeterMetaInfo(&pPrevSql->cmd, pPrevSql->cmd.clauseIndex, 0);
|
||||||
|
|
||||||
STableMeta* pPrevMeterMeta = taosTransferDataInCache(tscCacheHandle, (void**)&pPrevInfo->pMeterMeta);
|
STableMeta* pPrevMeterMeta = taosCacheTransfer(tscCacheHandle, (void**)&pPrevInfo->pMeterMeta);
|
||||||
SSuperTableMeta* pPrevMetricMeta = taosTransferDataInCache(tscCacheHandle, (void**)&pPrevInfo->pMetricMeta);
|
SSuperTableMeta* pPrevMetricMeta = taosCacheTransfer(tscCacheHandle, (void**)&pPrevInfo->pMetricMeta);
|
||||||
|
|
||||||
pFinalInfo = tscAddMeterMetaInfo(pNewQueryInfo, name, pPrevMeterMeta, pPrevMetricMeta, pMeterMetaInfo->numOfTags,
|
pFinalInfo = tscAddMeterMetaInfo(pNewQueryInfo, name, pPrevMeterMeta, pPrevMetricMeta, pMeterMetaInfo->numOfTags,
|
||||||
pMeterMetaInfo->tagColumnIndex);
|
pMeterMetaInfo->tagColumnIndex);
|
||||||
|
|
|
@ -20,7 +20,63 @@
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <stdbool.h>
|
#include "os.h"
|
||||||
|
#include "tref.h"
|
||||||
|
#include "hash.h"
|
||||||
|
|
||||||
|
typedef struct SCacheStatis {
|
||||||
|
int64_t missCount;
|
||||||
|
int64_t hitCount;
|
||||||
|
int64_t totalAccess;
|
||||||
|
int64_t refreshCount;
|
||||||
|
int32_t numOfCollision;
|
||||||
|
} SCacheStatis;
|
||||||
|
|
||||||
|
typedef struct SCacheDataNode {
|
||||||
|
uint64_t addedTime; // the added time when this element is added or updated into cache
|
||||||
|
uint64_t expiredTime; // expiredTime expiredTime when this element should be remove from cache
|
||||||
|
uint64_t signature;
|
||||||
|
uint32_t size; // allocated size for current SCacheDataNode
|
||||||
|
uint16_t keySize : 15;
|
||||||
|
bool inTrash : 1; // denote if it is in trash or not
|
||||||
|
T_REF_DECLARE()
|
||||||
|
char *key;
|
||||||
|
char data[];
|
||||||
|
} SCacheDataNode;
|
||||||
|
|
||||||
|
typedef struct STrashElem {
|
||||||
|
struct STrashElem *prev;
|
||||||
|
struct STrashElem *next;
|
||||||
|
SCacheDataNode * pData;
|
||||||
|
} STrashElem;
|
||||||
|
|
||||||
|
typedef struct {
|
||||||
|
int64_t totalSize; // total allocated buffer in this hash table, SCacheObj is not included.
|
||||||
|
int64_t refreshTime;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* to accommodate the old datanode which has the same key value of new one in hashList
|
||||||
|
* when an new node is put into cache, if an existed one with the same key:
|
||||||
|
* 1. if the old one does not be referenced, update it.
|
||||||
|
* 2. otherwise, move the old one to pTrash, addedTime the new one.
|
||||||
|
*
|
||||||
|
* when the node in pTrash does not be referenced, it will be release at the expired expiredTime
|
||||||
|
*/
|
||||||
|
STrashElem * pTrash;
|
||||||
|
void * tmrCtrl;
|
||||||
|
void * pTimer;
|
||||||
|
SCacheStatis statistics;
|
||||||
|
SHashObj * pHashTable;
|
||||||
|
int numOfElemsInTrash; // number of element in trash
|
||||||
|
int16_t deleting; // set the deleting flag to stop refreshing ASAP.
|
||||||
|
|
||||||
|
#if defined(LINUX)
|
||||||
|
pthread_rwlock_t lock;
|
||||||
|
#else
|
||||||
|
pthread_mutex_t lock;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
} SCacheObj;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
|
@ -30,7 +86,7 @@ extern "C" {
|
||||||
* not referenced by other objects
|
* not referenced by other objects
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
void *taosInitDataCache(int maxSessions, void *tmrCtrl, int64_t refreshTimeInSeconds);
|
SCacheObj *taosCacheInit(void *tmrCtrl, int64_t refreshTimeInSeconds);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* add data into cache
|
* add data into cache
|
||||||
|
@ -42,7 +98,35 @@ void *taosInitDataCache(int maxSessions, void *tmrCtrl, int64_t refreshTimeInSec
|
||||||
* @param keepTime survival time in second
|
* @param keepTime survival time in second
|
||||||
* @return cached element
|
* @return cached element
|
||||||
*/
|
*/
|
||||||
void *taosAddDataIntoCache(void *handle, char *key, char *pData, int dataSize, int keepTimeInSeconds);
|
void *taosCachePut(void *handle, char *key, char *pData, int dataSize, int keepTimeInSeconds);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* get data from cache
|
||||||
|
* @param handle cache object
|
||||||
|
* @param key key
|
||||||
|
* @return cached data or NULL
|
||||||
|
*/
|
||||||
|
void *taosCacheAcquireByName(void *handle, char *key);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Add one reference count for the exist data, and assign this data for a new owner.
|
||||||
|
* The new owner needs to invoke the taosCacheRelease when it does not need this data anymore.
|
||||||
|
* This procedure is a faster version of taosCacheAcquireByName function, which avoids the sideeffect of the problem of
|
||||||
|
* the data is moved to trash, and taosCacheAcquireByName will fail to retrieve it again.
|
||||||
|
*
|
||||||
|
* @param handle
|
||||||
|
* @param data
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
void *taosCacheAcquireByData(void *handle, void *data);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* transfer the ownership of data in cache to another object without increasing reference count.
|
||||||
|
* @param handle
|
||||||
|
* @param data
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
void *taosCacheTransfer(void *handle, void **data);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* remove data in cache, the data will not be removed immediately.
|
* remove data in cache, the data will not be removed immediately.
|
||||||
|
@ -52,59 +136,26 @@ void *taosAddDataIntoCache(void *handle, char *key, char *pData, int dataSize, i
|
||||||
* @param _remove force model, reduce the ref count and move the data into
|
* @param _remove force model, reduce the ref count and move the data into
|
||||||
* pTrash
|
* pTrash
|
||||||
*/
|
*/
|
||||||
void taosRemoveDataFromCache(void *handle, void **data, bool _remove);
|
void taosCacheRelease(void *handle, void **data, bool _remove);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* update data in cache
|
* move all data node into trash, clear node in trash can if it is not referenced by any clients
|
||||||
* @param handle hash object handle(pointer)
|
* @param handle
|
||||||
* @param key key for hash
|
|
||||||
* @param pData actually data
|
|
||||||
* @param size length of data
|
|
||||||
* @param duration survival time of this object in cache
|
|
||||||
* @return new referenced data
|
|
||||||
*/
|
*/
|
||||||
void *taosUpdateDataFromCache(void *handle, char *key, char *pData, int size, int duration);
|
void taosCacheEmpty(SCacheObj *pCacheObj);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* get data from cache
|
* release all allocated memory and destroy the cache object.
|
||||||
* @param handle cache object
|
*
|
||||||
* @param key key
|
* This function only set the deleting flag, and the specific work of clean up cache is delegated to
|
||||||
* @return cached data or NULL
|
* taosCacheRefresh function, which will executed every SCacheObj->refreshTime sec.
|
||||||
*/
|
*
|
||||||
void *taosGetDataFromCache(void *handle, char *key);
|
* If the value of SCacheObj->refreshTime is too large, the taosCacheRefresh function may not be invoked
|
||||||
|
* before the main thread terminated, in which case all allocated resources are simply recycled by OS.
|
||||||
/**
|
|
||||||
* release all allocated memory and destroy the cache object
|
|
||||||
*
|
*
|
||||||
* @param handle
|
* @param handle
|
||||||
*/
|
*/
|
||||||
void taosCleanUpDataCache(void *handle);
|
void taosCacheCleanup(SCacheObj *pCacheObj);
|
||||||
|
|
||||||
/**
|
|
||||||
* move all data node into trash,clear node in trash can if it is not referenced by client
|
|
||||||
* @param handle
|
|
||||||
*/
|
|
||||||
void taosClearDataCache(void *handle);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Add one reference count for the exist data, and assign this data for a new owner.
|
|
||||||
* The new owner needs to invoke the taosRemoveDataFromCache when it does not need this data anymore.
|
|
||||||
* This procedure is a faster version of taosGetDataFromCache function, which avoids the sideeffect of the problem of the
|
|
||||||
* data is moved to trash, and taosGetDataFromCache will fail to retrieve it again.
|
|
||||||
*
|
|
||||||
* @param handle
|
|
||||||
* @param data
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
void* taosGetDataFromExists(void* handle, void* data);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* transfer the ownership of data in cache to another object without increasing reference count.
|
|
||||||
* @param handle
|
|
||||||
* @param data
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
void* taosTransferDataInCache(void* handle, void** data);
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue