From b28dde67ee79a85aba7f1fb03116e3d6f608d424 Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Fri, 21 Aug 2020 00:57:18 +0800
Subject: [PATCH] [td-1067] update the tablemeta life time

---
 src/client/src/tscServer.c |  4 ++--
 src/util/inc/tcache.h      | 12 +-----------
 src/util/src/tcache.c      |  4 ++--
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c
index 172f18af94..64562ef912 100644
--- a/src/client/src/tscServer.c
+++ b/src/client/src/tscServer.c
@@ -1702,7 +1702,7 @@ int tscProcessTableMetaRsp(SSqlObj *pSql) {
   assert(pTableMetaInfo->pTableMeta == NULL);
 
   pTableMetaInfo->pTableMeta = (STableMeta *) taosCachePut(tscCacheHandle, pTableMetaInfo->name,
-      strlen(pTableMetaInfo->name), pTableMeta, size, tsTableMetaKeepTimer);
+      strlen(pTableMetaInfo->name), pTableMeta, size, tsTableMetaKeepTimer * 1000);
   
   // todo handle out of memory case
   if (pTableMetaInfo->pTableMeta == NULL) {
@@ -1906,7 +1906,7 @@ int tscProcessShowRsp(SSqlObj *pSql) {
   STableMeta* pTableMeta = tscCreateTableMetaFromMsg(pMetaMsg, &size);
   
   pTableMetaInfo->pTableMeta = taosCachePut(tscCacheHandle, key, strlen(key), (char *)pTableMeta, size,
-      tsTableMetaKeepTimer);
+      tsTableMetaKeepTimer * 1000);
   SSchema *pTableSchema = tscGetTableSchema(pTableMetaInfo->pTableMeta);
 
   if (pQueryInfo->colList == NULL) {
diff --git a/src/util/inc/tcache.h b/src/util/inc/tcache.h
index 11121fcf3b..3d6f9705ee 100644
--- a/src/util/inc/tcache.h
+++ b/src/util/inc/tcache.h
@@ -103,7 +103,7 @@ SCacheObj *taosCacheInit(int32_t keyType, int64_t refreshTimeInSeconds, bool ext
  * @param keepTime      survival time in second
  * @return              cached element
  */
-void *taosCachePut(SCacheObj *pCacheObj, const void *key, size_t keyLen, const void *pData, size_t dataSize, int keepTimeInSeconds);
+void *taosCachePut(SCacheObj *pCacheObj, const void *key, size_t keyLen, const void *pData, size_t dataSize, int durationMS);
 
 /**
  * get data from cache
@@ -113,16 +113,6 @@ void *taosCachePut(SCacheObj *pCacheObj, const void *key, size_t keyLen, const v
  */
 void *taosCacheAcquireByKey(SCacheObj *pCacheObj, const void *key, size_t keyLen);
 
-/**
- * update the expire time of data in cache 
- * @param pCacheObj     cache object
- * @param key           key
- * @param keyLen        keyLen
- * @param expireTime    new expire time of data
- * @return
- */ 
-//void* taosCacheUpdateExpireTimeByName(SCacheObj *pCacheObj, void *key, size_t keyLen, uint64_t expireTime);
-
 /**
  * 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.
diff --git a/src/util/src/tcache.c b/src/util/src/tcache.c
index bd903c8c23..dfa982b848 100644
--- a/src/util/src/tcache.c
+++ b/src/util/src/tcache.c
@@ -189,12 +189,12 @@ SCacheObj *taosCacheInit(int32_t keyType, int64_t refreshTimeInSeconds, bool ext
   return pCacheObj;
 }
 
-void *taosCachePut(SCacheObj *pCacheObj, const void *key, size_t keyLen, const void *pData, size_t dataSize, int duration) {
+void *taosCachePut(SCacheObj *pCacheObj, const void *key, size_t keyLen, const void *pData, size_t dataSize, int durationMS) {
   if (pCacheObj == NULL || pCacheObj->pHashTable == NULL || pCacheObj->deleting == 1) {
     return NULL;
   }
 
-  SCacheDataNode *pNode1 = taosCreateCacheNode(key, keyLen, pData, dataSize, duration);
+  SCacheDataNode *pNode1 = taosCreateCacheNode(key, keyLen, pData, dataSize, durationMS);
   if (pNode1 == NULL) {
     uError("cache:%s, key:%p, failed to added into cache, out of memory", pCacheObj->name, key);
     return NULL;
-- 
GitLab