diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c
index 84d87af385506beeee29575002a31c873845d186..baa15382977dc90cac19088f531d559da255411b 100644
--- a/src/client/src/tscSQLParser.c
+++ b/src/client/src/tscSQLParser.c
@@ -1938,8 +1938,10 @@ int32_t addProjectionExprAndResultField(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, t
     }
 
     if (index.columnIndex == TSDB_TBNAME_COLUMN_INDEX) {
-      SSchema* colSchema = tGetTbnameColumnSchema();
-      tscAddFuncInSelectClause(pQueryInfo, startPos, TSDB_FUNC_TAGPRJ, &index, colSchema, TSDB_COL_TAG, getNewResColId(pCmd));
+      SSchema colSchema = *tGetTbnameColumnSchema();
+      getColumnName(pItem, colSchema.name, colSchema.name, sizeof(colSchema.name) - 1);
+
+      /*SExprInfo* pExpr = */tscAddFuncInSelectClause(pQueryInfo, startPos, TSDB_FUNC_TAGPRJ, &index, &colSchema, TSDB_COL_TAG, getNewResColId(pCmd));
     } else {
       STableMetaInfo* pTableMetaInfo = tscGetMetaInfo(pQueryInfo, index.tableIndex);
       STableMeta*     pTableMeta = pTableMetaInfo->pTableMeta;
@@ -2151,10 +2153,6 @@ int32_t addExprAndResultField(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, int32_t col
     case TSDB_FUNC_AVG:
     case TSDB_FUNC_RATE:
     case TSDB_FUNC_IRATE:
-    case TSDB_FUNC_SUM_RATE:
-    case TSDB_FUNC_SUM_IRATE:
-    case TSDB_FUNC_AVG_RATE:
-    case TSDB_FUNC_AVG_IRATE:
     case TSDB_FUNC_TWA:
     case TSDB_FUNC_MIN:
     case TSDB_FUNC_MAX:
@@ -2219,8 +2217,7 @@ int32_t addExprAndResultField(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, int32_t col
 
       SExprInfo* pExpr = tscExprAppend(pQueryInfo, functionId, &index, resultType, resultSize, getNewResColId(pCmd), resultSize, false);
 
-      if (functionId == TSDB_FUNC_LEASTSQR) {
-        /* set the leastsquares parameters */
+      if (functionId == TSDB_FUNC_LEASTSQR) { // set the leastsquares parameters
         char val[8] = {0};
         if (tVariantDump(&pParamElem[1].pNode->value, val, TSDB_DATA_TYPE_DOUBLE, true) < 0) {
           return TSDB_CODE_TSC_INVALID_OPERATION;
@@ -2234,6 +2231,11 @@ int32_t addExprAndResultField(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, int32_t col
         }
 
         tscExprAddParams(&pExpr->base, val, TSDB_DATA_TYPE_DOUBLE, sizeof(double));
+      } else if (functionId == TSDB_FUNC_IRATE) {
+        STableComInfo info = tscGetTableInfo(pTableMetaInfo->pTableMeta);
+        int64_t prec = info.precision;
+
+        tscExprAddParams(&pExpr->base, (char*)&prec, TSDB_DATA_TYPE_BIGINT, LONG_BYTES);
       }
 
       SColumnList ids = createColumnList(1, index.tableIndex, index.columnIndex);
@@ -2882,7 +2884,7 @@ int32_t tscTansformFuncForSTableQuery(SQueryInfo* pQueryInfo) {
     
     if ((functionId >= TSDB_FUNC_SUM && functionId <= TSDB_FUNC_TWA) ||
         (functionId >= TSDB_FUNC_FIRST_DST && functionId <= TSDB_FUNC_STDDEV_DST) ||
-        (functionId >= TSDB_FUNC_RATE && functionId <= TSDB_FUNC_AVG_IRATE)) {
+        (functionId >= TSDB_FUNC_RATE && functionId <= TSDB_FUNC_IRATE)) {
       if (getResultDataInfo(pSrcSchema->type, pSrcSchema->bytes, functionId, (int32_t)pExpr->base.param[0].i64, &type, &bytes,
                             &interBytes, 0, true) != TSDB_CODE_SUCCESS) {
         return TSDB_CODE_TSC_INVALID_OPERATION;
@@ -3894,7 +3896,8 @@ static int32_t handleExprInQueryCond(SSqlCmd* pCmd, SQueryInfo* pQueryInfo, tSql
     return code;
   }
 
-  if (index.columnIndex == PRIMARYKEY_TIMESTAMP_COL_INDEX) {  // query on time range
+  SSchema* pSchema = tscGetTableColumnSchema(pTableMeta, index.columnIndex);
+  if (pSchema->type == TSDB_DATA_TYPE_TIMESTAMP && index.columnIndex == PRIMARYKEY_TIMESTAMP_COL_INDEX) {  // query on time range
     if (!validateJoinExprNode(pCmd, pQueryInfo, *pExpr, &index)) {
       return TSDB_CODE_TSC_INVALID_OPERATION;
     }
@@ -6854,6 +6857,7 @@ int32_t doCheckForStream(SSqlObj* pSql, SSqlInfo* pInfo) {
   const char* msg5 = "sql too long";  // todo ADD support
   const char* msg6 = "from missing in subclause";
   const char* msg7 = "time interval is required";
+  const char* msg8 = "the first column should be primary timestamp column";
   
   SSqlCmd*    pCmd = &pSql->cmd;
   SQueryInfo* pQueryInfo = tscGetQueryInfo(pCmd);
@@ -6907,13 +6911,19 @@ int32_t doCheckForStream(SSqlObj* pSql, SSqlInfo* pInfo) {
     return TSDB_CODE_TSC_INVALID_OPERATION;
   }
 
-
   if (isTimeWindowQuery(pQueryInfo) && (validateFunctionsInIntervalOrGroupbyQuery(pCmd, pQueryInfo) != TSDB_CODE_SUCCESS)) {
     return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg2);
   }
 
-  if (!tscIsProjectionQuery(pQueryInfo) && pQueryInfo->interval.interval == 0) {
-    return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg7);
+  if (tscIsProjectionQuery(pQueryInfo)) {
+    SExprInfo* pExpr = tscExprGet(pQueryInfo, 0);
+    if (pExpr->base.colInfo.colId != PRIMARYKEY_TIMESTAMP_COL_INDEX) {
+      return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg8);
+    }
+  } else {
+    if (pQueryInfo->interval.interval == 0) {
+      return invalidOperationMsg(tscGetErrorMsgPayload(pCmd), msg7);
+    }
   }
 
   // set the created table[stream] name
diff --git a/src/inc/taoserror.h b/src/inc/taoserror.h
index ab15e851e76e1c7ad29a81a7cd1874a9e89d82ed..431c9116ccec57d90a1dbe2405845f6c26a5fef6 100644
--- a/src/inc/taoserror.h
+++ b/src/inc/taoserror.h
@@ -244,6 +244,7 @@ int32_t* taosGetErrno();
 #define TSDB_CODE_TDB_NO_AVAIL_DISK             TAOS_DEF_ERROR_CODE(0, 0x0613)  //"No available disk")
 #define TSDB_CODE_TDB_MESSED_MSG                TAOS_DEF_ERROR_CODE(0, 0x0614)  //"TSDB messed message")
 #define TSDB_CODE_TDB_IVLD_TAG_VAL              TAOS_DEF_ERROR_CODE(0, 0x0615)  //"TSDB invalid tag value")
+#define TSDB_CODE_TDB_NO_CACHE_LAST_ROW         TAOS_DEF_ERROR_CODE(0, 0x0616)  //"TSDB no cache last row data")
 
 // query
 #define TSDB_CODE_QRY_INVALID_QHANDLE           TAOS_DEF_ERROR_CODE(0, 0x0700)  //"Invalid handle")
diff --git a/src/os/src/detail/osTime.c b/src/os/src/detail/osTime.c
index 67e0c2642e42f66229c437e603f7062edf571f34..2956dd29ad77dd82f1ed3d161f7b26af310d7347 100644
--- a/src/os/src/detail/osTime.c
+++ b/src/os/src/detail/osTime.c
@@ -43,7 +43,7 @@
  */
 int64_t user_mktime64(const unsigned int year0, const unsigned int mon0,
 		const unsigned int day, const unsigned int hour,
-		const unsigned int min, const unsigned int sec, int64_t timezone)
+		const unsigned int min, const unsigned int sec, int64_t time_zone)
 {
   unsigned int mon = mon0, year = year0;
 
@@ -61,7 +61,7 @@ int64_t user_mktime64(const unsigned int year0, const unsigned int mon0,
   res  = res*24;
   res  = ((res + hour) * 60 + min) * 60 + sec;
 
-  return (res + timezone);
+  return (res + time_zone);
 }
 
 // ==== mktime() kernel code =================//
diff --git a/src/query/inc/qAggMain.h b/src/query/inc/qAggMain.h
index bdccd4eb3c0da8b54bd0c44589146750c8eddee7..47c61fc4446973b04bd558559e0a335fb944dbd2 100644
--- a/src/query/inc/qAggMain.h
+++ b/src/query/inc/qAggMain.h
@@ -65,24 +65,18 @@ extern "C" {
 
 #define TSDB_FUNC_RATE         29
 #define TSDB_FUNC_IRATE        30
-#define TSDB_FUNC_SUM_RATE     31
-#define TSDB_FUNC_SUM_IRATE    32
-#define TSDB_FUNC_AVG_RATE     33
-#define TSDB_FUNC_AVG_IRATE    34
-
-#define TSDB_FUNC_TID_TAG      35
-#define TSDB_FUNC_BLKINFO      36
-
-#define TSDB_FUNC_HISTOGRAM    37
-#define TSDB_FUNC_HLL          38
-#define TSDB_FUNC_MODE         39
-#define TSDB_FUNC_SAMPLE       40
-#define TSDB_FUNC_CEIL         41
-#define TSDB_FUNC_FLOOR        42
-#define TSDB_FUNC_ROUND        43
-#define TSDB_FUNC_MAVG         44
-#define TSDB_FUNC_CSUM         45
-
+#define TSDB_FUNC_TID_TAG      31
+#define TSDB_FUNC_BLKINFO      32
+
+#define TSDB_FUNC_HISTOGRAM    33
+#define TSDB_FUNC_HLL          34
+#define TSDB_FUNC_MODE         35
+#define TSDB_FUNC_SAMPLE       36
+#define TSDB_FUNC_CEIL         37
+#define TSDB_FUNC_FLOOR        38
+#define TSDB_FUNC_ROUND        39
+#define TSDB_FUNC_MAVG         40
+#define TSDB_FUNC_CSUM         41
 
 #define TSDB_FUNCSTATE_SO           0x1u    // single output
 #define TSDB_FUNCSTATE_MO           0x2u    // dynamic number of output, not multinumber of output e.g., TOP/BOTTOM
diff --git a/src/query/src/qAggMain.c b/src/query/src/qAggMain.c
index be0716ce9956cf4e8bc19935ce49c92958d7e84c..ba6efcabb2f0788908485d3af246a6e0855ed2a1 100644
--- a/src/query/src/qAggMain.c
+++ b/src/query/src/qAggMain.c
@@ -152,15 +152,13 @@ typedef struct STSCompInfo {
 } STSCompInfo;
 
 typedef struct SRateInfo {
-  int64_t CorrectionValue;
-  int64_t firstValue;
+  double  correctionValue;
+  double  firstValue;
   TSKEY   firstKey;
-  int64_t lastValue;
+  double  lastValue;
   TSKEY   lastKey;
   int8_t  hasResult;  // flag to denote has value
   bool    isIRate;    // true for IRate functions, false for Rate functions
-  int64_t num;        // for sum/avg
-  double  sum;        // for sum/avg
 } SRateInfo;
 
 int32_t getResultDataInfo(int32_t dataType, int32_t dataBytes, int32_t functionId, int32_t param, int16_t *type,
@@ -238,7 +236,7 @@ int32_t getResultDataInfo(int32_t dataType, int32_t dataBytes, int32_t functionI
       *interBytes = *bytes;
       return TSDB_CODE_SUCCESS;
       
-    } else if (functionId >= TSDB_FUNC_RATE && functionId <= TSDB_FUNC_AVG_IRATE) {
+    } else if (functionId >= TSDB_FUNC_RATE && functionId <= TSDB_FUNC_IRATE) {
       *type = TSDB_DATA_TYPE_DOUBLE;
       *bytes = sizeof(SRateInfo);
       *interBytes = sizeof(SRateInfo);
@@ -304,7 +302,7 @@ int32_t getResultDataInfo(int32_t dataType, int32_t dataBytes, int32_t functionI
     *type = TSDB_DATA_TYPE_DOUBLE;
     *bytes = sizeof(double);
     *interBytes = sizeof(SAvgInfo);
-  } else if (functionId >= TSDB_FUNC_RATE && functionId <= TSDB_FUNC_AVG_IRATE) {
+  } else if (functionId >= TSDB_FUNC_RATE && functionId <= TSDB_FUNC_IRATE) {
     *type = TSDB_DATA_TYPE_DOUBLE;
     *bytes = sizeof(double);
     *interBytes = sizeof(SRateInfo);
@@ -4479,36 +4477,34 @@ static void ts_comp_finalize(SQLFunctionCtx *pCtx) {
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////////
-// RATE functions
-
-static double do_calc_rate(const SRateInfo* pRateInfo) {
-  if ((INT64_MIN == pRateInfo->lastKey) || (INT64_MIN == pRateInfo->firstKey) || (pRateInfo->firstKey >= pRateInfo->lastKey)) {
-    return 0;
+// rate functions
+static double do_calc_rate(const SRateInfo* pRateInfo, double tickPerSec) {
+  if ((INT64_MIN == pRateInfo->lastKey) || (INT64_MIN == pRateInfo->firstKey) ||
+      (pRateInfo->firstKey >= pRateInfo->lastKey)) {
+    return 0.0;
   }
-  
-  int64_t diff = 0;
-  
+
+  double diff = 0;
   if (pRateInfo->isIRate) {
+    // If the previous value of the last is greater than the last value, only keep the last point instead of the delta
+    // value between two values.
     diff = pRateInfo->lastValue;
     if (diff >= pRateInfo->firstValue) {
       diff -= pRateInfo->firstValue;
     }
   } else {
-    diff = pRateInfo->CorrectionValue + pRateInfo->lastValue -  pRateInfo->firstValue;
+    diff = pRateInfo->correctionValue + pRateInfo->lastValue -  pRateInfo->firstValue;
     if (diff <= 0) {
       return 0;
     }
   }
   
   int64_t duration = pRateInfo->lastKey - pRateInfo->firstKey;
-  duration = (duration + 500) / 1000;
-  
-  double resultVal = ((double)diff) / duration;
-  
-  qDebug("do_calc_rate() isIRate:%d firstKey:%" PRId64 " lastKey:%" PRId64 " firstValue:%" PRId64 " lastValue:%" PRId64 " CorrectionValue:%" PRId64 " resultVal:%f",
-         pRateInfo->isIRate, pRateInfo->firstKey, pRateInfo->lastKey, pRateInfo->firstValue, pRateInfo->lastValue, pRateInfo->CorrectionValue, resultVal);
-  
-  return resultVal;
+  if (duration == 0) {
+    return 0;
+  }
+
+  return (duration > 0)? ((double)diff) / (duration/tickPerSec):0.0;
 }
 
 static bool rate_function_setup(SQLFunctionCtx *pCtx) {
@@ -4516,19 +4512,17 @@ static bool rate_function_setup(SQLFunctionCtx *pCtx) {
     return false;
   }
   
-  SResultRowCellInfo *pResInfo = GET_RES_INFO(pCtx);  //->pOutput + pCtx->outputBytes;
-  SRateInfo *   pInfo = GET_ROWCELL_INTERBUF(pResInfo);
-  
-  pInfo->CorrectionValue = 0;
+  SResultRowCellInfo *pResInfo = GET_RES_INFO(pCtx);
+
+  SRateInfo *pInfo = GET_ROWCELL_INTERBUF(pResInfo);
+  pInfo->correctionValue = 0;
   pInfo->firstKey    = INT64_MIN;
   pInfo->lastKey     = INT64_MIN;
   pInfo->firstValue  = INT64_MIN;
   pInfo->lastValue   = INT64_MIN;
-  pInfo->num = 0;
-  pInfo->sum = 0;
-  
+
   pInfo->hasResult = 0;
-  pInfo->isIRate = ((pCtx->functionId == TSDB_FUNC_IRATE) || (pCtx->functionId == TSDB_FUNC_SUM_IRATE) || (pCtx->functionId == TSDB_FUNC_AVG_IRATE));
+  pInfo->isIRate = (pCtx->functionId == TSDB_FUNC_IRATE);
   return true;
 }
 
@@ -4550,26 +4544,22 @@ static void rate_function(SQLFunctionCtx *pCtx) {
     
     notNullElems++;
     
-    int64_t v = 0;
-    GET_TYPED_DATA(v, int64_t, pCtx->inputType, pData);
+    double v = 0;
+    GET_TYPED_DATA(v, double, pCtx->inputType, pData);
     
     if ((INT64_MIN == pRateInfo->firstValue) || (INT64_MIN == pRateInfo->firstKey)) {
       pRateInfo->firstValue = v;
       pRateInfo->firstKey = primaryKey[i];
-      
-      qDebug("firstValue:%" PRId64 " firstKey:%" PRId64, pRateInfo->firstValue, pRateInfo->firstKey);
     }
     
     if (INT64_MIN == pRateInfo->lastValue) {
       pRateInfo->lastValue = v;
     } else if (v < pRateInfo->lastValue) {
-      pRateInfo->CorrectionValue += pRateInfo->lastValue;
-      qDebug("CorrectionValue:%" PRId64, pRateInfo->CorrectionValue);
+      pRateInfo->correctionValue += pRateInfo->lastValue;
     }
     
     pRateInfo->lastValue = v;
     pRateInfo->lastKey   = primaryKey[i];
-    qDebug("lastValue:%" PRId64 " lastKey:%" PRId64, pRateInfo->lastValue, pRateInfo->lastKey);
   }
   
   if (!pCtx->hasNull) {
@@ -4600,8 +4590,8 @@ static void rate_function_f(SQLFunctionCtx *pCtx, int32_t index) {
   SRateInfo   *pRateInfo  = (SRateInfo *)GET_ROWCELL_INTERBUF(pResInfo);
   TSKEY     *primaryKey = GET_TS_LIST(pCtx);
 
-  int64_t v = 0;
-  GET_TYPED_DATA(v, int64_t, pCtx->inputType, pData);
+  double v = 0;
+  GET_TYPED_DATA(v, double, pCtx->inputType, pData);
   
   if ((INT64_MIN == pRateInfo->firstValue) || (INT64_MIN == pRateInfo->firstKey)) {
     pRateInfo->firstValue = v;
@@ -4611,14 +4601,12 @@ static void rate_function_f(SQLFunctionCtx *pCtx, int32_t index) {
   if (INT64_MIN == pRateInfo->lastValue) {
     pRateInfo->lastValue = v;
   } else if (v < pRateInfo->lastValue) {
-    pRateInfo->CorrectionValue += pRateInfo->lastValue;
+    pRateInfo->correctionValue += pRateInfo->lastValue;
   }
   
   pRateInfo->lastValue = v;
   pRateInfo->lastKey   = primaryKey[index];
   
-  qDebug("====%p rate_function_f() index:%d lastValue:%" PRId64 " lastKey:%" PRId64 " CorrectionValue:%" PRId64, pCtx, index, pRateInfo->lastValue, pRateInfo->lastKey, pRateInfo->CorrectionValue);
-  
   SET_VAL(pCtx, 1, 1);
   
   // set has result flag
@@ -4637,28 +4625,19 @@ static void rate_func_copy(SQLFunctionCtx *pCtx) {
   SResultRowCellInfo *pResInfo = GET_RES_INFO(pCtx);
   memcpy(GET_ROWCELL_INTERBUF(pResInfo), pCtx->pInput, (size_t)pCtx->inputBytes);
   pResInfo->hasResult = ((SRateInfo*)pCtx->pInput)->hasResult;
-  
-  SRateInfo* pRateInfo = (SRateInfo*)pCtx->pInput;
-  qDebug("%p rate_func_merge() firstKey:%" PRId64 " lastKey:%" PRId64 " firstValue:%" PRId64 " lastValue:%" PRId64 " CorrectionValue:%" PRId64 " hasResult:%d",
-         pCtx, pRateInfo->firstKey, pRateInfo->lastKey, pRateInfo->firstValue, pRateInfo->lastValue, pRateInfo->CorrectionValue, pRateInfo->hasResult);
 }
 
 static void rate_finalizer(SQLFunctionCtx *pCtx) {
   SResultRowCellInfo *pResInfo  = GET_RES_INFO(pCtx);
   SRateInfo   *pRateInfo = (SRateInfo *)GET_ROWCELL_INTERBUF(pResInfo);
   
-  qDebug("%p isIRate:%d firstKey:%" PRId64 " lastKey:%" PRId64 " firstValue:%" PRId64 " lastValue:%" PRId64 " CorrectionValue:%" PRId64 " hasResult:%d",
-         pCtx, pRateInfo->isIRate, pRateInfo->firstKey, pRateInfo->lastKey, pRateInfo->firstValue, pRateInfo->lastValue, pRateInfo->CorrectionValue, pRateInfo->hasResult);
-  
   if (pRateInfo->hasResult != DATA_SET_FLAG) {
     setNull(pCtx->pOutput, TSDB_DATA_TYPE_DOUBLE, sizeof(double));
     return;
   }
   
-  *(double*)pCtx->pOutput = do_calc_rate(pRateInfo);
-  
-  qDebug("rate_finalizer() output result:%f", *(double *)pCtx->pOutput);
-  
+  *(double*) pCtx->pOutput = do_calc_rate(pRateInfo, TSDB_TICK_PER_SECOND(pCtx->param[0].i64));
+
   // cannot set the numOfIteratedElems again since it is set during previous iteration
   pResInfo->numOfRes  = 1;
   pResInfo->hasResult = DATA_SET_FLAG;
@@ -4667,44 +4646,32 @@ static void rate_finalizer(SQLFunctionCtx *pCtx) {
 }
 
 static void irate_function(SQLFunctionCtx *pCtx) {
-  
-  int32_t       notNullElems = 0;
-  SResultRowCellInfo  *pResInfo     = GET_RES_INFO(pCtx);
-  SRateInfo   *pRateInfo    = (SRateInfo *)GET_ROWCELL_INTERBUF(pResInfo);
-  TSKEY     *primaryKey = GET_TS_LIST(pCtx);
+  SResultRowCellInfo  *pResInfo = GET_RES_INFO(pCtx);
 
-  qDebug("%p irate_function() size:%d, hasNull:%d", pCtx, pCtx->size, pCtx->hasNull);
-  
-  if (pCtx->size < 1) {
-    return;
-  }
+  int32_t    notNullElems = 0;
+  SRateInfo *pRateInfo    = (SRateInfo *)GET_ROWCELL_INTERBUF(pResInfo);
+  TSKEY     *primaryKey   = GET_TS_LIST(pCtx);
   
   for (int32_t i = pCtx->size - 1; i >= 0; --i) {
     char *pData = GET_INPUT_DATA(pCtx, i);
     if (pCtx->hasNull && isNull(pData, pCtx->inputType)) {
-      qDebug("%p irate_function() index of null data:%d", pCtx, i);
       continue;
     }
     
     notNullElems++;
     
-    int64_t v = 0;
-    GET_TYPED_DATA(v, int64_t, pCtx->inputType, pData);
-    
-    // TODO: calc once if only call this function once ????
-    if ((INT64_MIN == pRateInfo->lastKey) || (INT64_MIN == pRateInfo->lastValue)) {
+    double v = 0;
+    GET_TYPED_DATA(v, double, pCtx->inputType, pData);
+
+    if ((INT64_MIN == pRateInfo->lastKey) || primaryKey[i] > pRateInfo->lastKey) {
       pRateInfo->lastValue = v;
       pRateInfo->lastKey   = primaryKey[i];
-      
-      qDebug("%p irate_function() lastValue:%" PRId64 " lastKey:%" PRId64, pCtx, pRateInfo->lastValue, pRateInfo->lastKey);
       continue;
     }
     
-    if ((INT64_MIN == pRateInfo->firstKey) || (INT64_MIN == pRateInfo->firstValue)){
+    if ((INT64_MIN == pRateInfo->firstKey) || primaryKey[i] > pRateInfo->firstKey) {
       pRateInfo->firstValue = v;
       pRateInfo->firstKey = primaryKey[i];
-      
-      qDebug("%p irate_function() firstValue:%" PRId64 " firstKey:%" PRId64, pCtx, pRateInfo->firstValue, pRateInfo->firstKey);
       break;
     }
   }
@@ -4733,8 +4700,8 @@ static void irate_function_f(SQLFunctionCtx *pCtx, int32_t index) {
   SRateInfo *pRateInfo  = (SRateInfo *)GET_ROWCELL_INTERBUF(pResInfo);
   TSKEY     *primaryKey = GET_TS_LIST(pCtx);
   
-  int64_t v = 0;
-  GET_TYPED_DATA(v, int64_t, pCtx->inputType, pData);
+  double v = 0;
+  GET_TYPED_DATA(v, double, pCtx->inputType, pData);
 
   pRateInfo->firstKey   = pRateInfo->lastKey;
   pRateInfo->firstValue = pRateInfo->lastValue;
@@ -4742,8 +4709,7 @@ static void irate_function_f(SQLFunctionCtx *pCtx, int32_t index) {
   pRateInfo->lastValue = v;
   pRateInfo->lastKey   = primaryKey[index];
   
-  qDebug("====%p irate_function_f() index:%d lastValue:%" PRId64 " lastKey:%" PRId64 " firstValue:%" PRId64 " firstKey:%" PRId64, pCtx, index, pRateInfo->lastValue, pRateInfo->lastKey, pRateInfo->firstValue , pRateInfo->firstKey);
-  
+//  qDebug("====%p irate_function_f() index:%d lastValue:%" PRId64 " lastKey:%" PRId64 " firstValue:%" PRId64 " firstKey:%" PRId64, pCtx, index, pRateInfo->lastValue, pRateInfo->lastKey, pRateInfo->firstValue , pRateInfo->firstKey);
   SET_VAL(pCtx, 1, 1);
   
   // set has result flag
@@ -4756,68 +4722,6 @@ static void irate_function_f(SQLFunctionCtx *pCtx, int32_t index) {
   }
 }
 
-static void do_sumrate_merge(SQLFunctionCtx *pCtx) {
-  SResultRowCellInfo *pResInfo = GET_RES_INFO(pCtx);
-  assert(pCtx->stableQuery);
-  
-  SRateInfo *pRateInfo = (SRateInfo *)GET_ROWCELL_INTERBUF(pResInfo);
-  char *    input = GET_INPUT_DATA_LIST(pCtx);
-  
-  for (int32_t i = 0; i < pCtx->size; ++i, input += pCtx->inputBytes) {
-    SRateInfo *pInput = (SRateInfo *)input;
-    
-    qDebug("%p do_sumrate_merge() hasResult:%d input num:%" PRId64 " input sum:%f total num:%" PRId64 " total sum:%f", pCtx, pInput->hasResult, pInput->num, pInput->sum, pRateInfo->num, pRateInfo->sum);
-    
-    if (pInput->hasResult != DATA_SET_FLAG) {
-      continue;
-    } else if (pInput->num == 0) {
-      pRateInfo->sum += do_calc_rate(pInput);
-      pRateInfo->num++;
-    } else {
-      pRateInfo->sum += pInput->sum;
-      pRateInfo->num += pInput->num;
-    }
-    pRateInfo->hasResult = DATA_SET_FLAG;
-  }
-  
-  // if the data set hasResult is not set, the result is null
-  if (DATA_SET_FLAG == pRateInfo->hasResult) {
-    pResInfo->hasResult = DATA_SET_FLAG;
-    SET_VAL(pCtx, pRateInfo->num, 1);
-    memcpy(pCtx->pOutput, GET_ROWCELL_INTERBUF(pResInfo), sizeof(SRateInfo));
-  }
-}
-
-static void sumrate_func_merge(SQLFunctionCtx *pCtx) {
-  qDebug("%p sumrate_func_merge() process ...", pCtx);
-  do_sumrate_merge(pCtx);
-}
-
-static void sumrate_finalizer(SQLFunctionCtx *pCtx) {
-  SResultRowCellInfo *pResInfo  = GET_RES_INFO(pCtx);
-  SRateInfo   *pRateInfo = (SRateInfo *)GET_ROWCELL_INTERBUF(pResInfo);
-  
-  qDebug("%p sumrate_finalizer() superTableQ:%d num:%" PRId64 " sum:%f hasResult:%d", pCtx, pCtx->stableQuery, pRateInfo->num, pRateInfo->sum, pRateInfo->hasResult);
-  
-  if (pRateInfo->hasResult != DATA_SET_FLAG) {
-    setNull(pCtx->pOutput, TSDB_DATA_TYPE_DOUBLE, sizeof(double));
-    return;
-  }
-  
-  if (pRateInfo->num == 0) {
-    // from meter
-    *(double*)pCtx->pOutput = do_calc_rate(pRateInfo);
-  } else if (pCtx->functionId == TSDB_FUNC_SUM_RATE || pCtx->functionId == TSDB_FUNC_SUM_IRATE) {
-    *(double*)pCtx->pOutput = pRateInfo->sum;
-  } else {
-    *(double*)pCtx->pOutput = pRateInfo->sum / pRateInfo->num;
-  }
-  
-  pResInfo->numOfRes  = 1;
-  pResInfo->hasResult = DATA_SET_FLAG;
-  doFinalizer(pCtx);
-}
-
 void blockInfo_func(SQLFunctionCtx* pCtx) {
   SResultRowCellInfo *pResInfo = GET_RES_INFO(pCtx);
   STableBlockDist* pDist = (STableBlockDist*) GET_ROWCELL_INTERBUF(pResInfo);
@@ -4983,12 +4887,12 @@ void blockinfo_func_finalizer(SQLFunctionCtx* pCtx) {
 int32_t functionCompatList[] = {
     // count,   sum,      avg,       min,      max,    stddev,    percentile,   apercentile, first,   last
     1,          1,        1,         1,        1,      1,          1,           1,           1,      1,
-    // last_row,top,      bottom,    spread,   twa,    leastsqr,   ts,          ts_dummy, tag_dummy, ts_z
+    // last_row,top,      bottom,    spread,   twa,    leastsqr,   ts,          ts_dummy, tag_dummy, ts_comp
     4,         -1,       -1,         1,        1,      1,          1,           1,        1,     -1,
-    //  tag,    colprj,   tagprj,    arithmetic, diff, first_dist, last_dist,   interp    rate    irate
-    1,          1,        1,         1,       -1,      1,          1,           5,        1,      1,
-    // sum_rate, sum_irate, avg_rate, avg_irate, tid_tag, blk_info
-    1,          1,        1,         1,          6,       7
+    //  tag,    colprj,   tagprj,    arithmetic, diff, first_dist, last_dist,   stddev_dst, interp    rate    irate
+    1,          1,        1,         1,       -1,      1,          1,           1,          5,        1,      1,
+    // tid_tag, blk_info
+     6,       7
 };
 
 SAggFunctionInfo aAggs[] = {{
@@ -5400,58 +5304,6 @@ SAggFunctionInfo aAggs[] = {{
                           },
                           {
                               // 31
-                              "sum_rate",
-                              TSDB_FUNC_SUM_RATE,
-                              TSDB_FUNC_SUM_RATE,
-                              TSDB_BASE_FUNC_SO | TSDB_FUNCSTATE_NEED_TS,
-                              rate_function_setup,
-                              rate_function,
-                              rate_function_f,
-                              sumrate_finalizer,
-                              sumrate_func_merge,
-                              dataBlockRequired,
-                          },
-                          {
-                              // 32
-                              "sum_irate",
-                              TSDB_FUNC_SUM_IRATE,
-                              TSDB_FUNC_SUM_IRATE,
-                              TSDB_BASE_FUNC_SO | TSDB_FUNCSTATE_NEED_TS,
-                              rate_function_setup,
-                              irate_function,
-                              irate_function_f,
-                              sumrate_finalizer,
-                              sumrate_func_merge,
-                              dataBlockRequired,
-                          },
-                          {
-                              // 33
-                              "avg_rate",
-                              TSDB_FUNC_AVG_RATE,
-                              TSDB_FUNC_AVG_RATE,
-                              TSDB_BASE_FUNC_SO | TSDB_FUNCSTATE_NEED_TS,
-                              rate_function_setup,
-                              rate_function,
-                              rate_function_f,
-                              sumrate_finalizer,
-                              sumrate_func_merge,
-                              dataBlockRequired,
-                          },
-                          {
-                              // 34
-                              "avg_irate",
-                              TSDB_FUNC_AVG_IRATE,
-                              TSDB_FUNC_AVG_IRATE,
-                              TSDB_BASE_FUNC_SO | TSDB_FUNCSTATE_NEED_TS,
-                              rate_function_setup,
-                              irate_function,
-                              irate_function_f,
-                              sumrate_finalizer,
-                              sumrate_func_merge,
-                              dataBlockRequired,
-                          },
-                          {
-                              // 35
                               "tbid",   // return table id and the corresponding tags for join match and subscribe
                               TSDB_FUNC_TID_TAG,
                               TSDB_FUNC_TID_TAG,
@@ -5464,15 +5316,15 @@ SAggFunctionInfo aAggs[] = {{
                               dataBlockRequired,
                           },
                           {
-                                // 35
-                                "_block_dist",   // return table id and the corresponding tags for join match and subscribe
-                                TSDB_FUNC_BLKINFO,
-                                TSDB_FUNC_BLKINFO,
-                                TSDB_FUNCSTATE_SO | TSDB_FUNCSTATE_STABLE,
-                                function_setup,
-                                blockInfo_func,
-                                noop2,
-                                blockinfo_func_finalizer,
-                                block_func_merge,
-                                dataBlockRequired,
+                                // 32
+                              "_block_dist",   // return table id and the corresponding tags for join match and subscribe
+                              TSDB_FUNC_BLKINFO,
+                              TSDB_FUNC_BLKINFO,
+                              TSDB_FUNCSTATE_SO | TSDB_FUNCSTATE_STABLE,
+                              function_setup,
+                              blockInfo_func,
+                              noop2,
+                              blockinfo_func_finalizer,
+                              block_func_merge,
+                              dataBlockRequired,
                           }};
diff --git a/src/query/src/qExecutor.c b/src/query/src/qExecutor.c
index b7512ac1f04e1cbc45100afd2bf1e84bb8e26dff..5ac19bba82508361a1b46ca58291648dc531e008 100644
--- a/src/query/src/qExecutor.c
+++ b/src/query/src/qExecutor.c
@@ -1990,23 +1990,6 @@ void setQueryKilled(SQInfo *pQInfo) { pQInfo->code = TSDB_CODE_TSC_QUERY_CANCELL
 //  return false;
 //}
 
-// TODO REFACTOR:MERGE WITH CLIENT-SIDE FUNCTION
-static UNUSED_FUNC bool isSumAvgRateQuery(SQueryAttr *pQueryAttr) {
-  for (int32_t i = 0; i < pQueryAttr->numOfOutput; ++i) {
-    int32_t functionId = pQueryAttr->pExpr1[i].base.functionId;
-    if (functionId == TSDB_FUNC_TS) {
-      continue;
-    }
-
-    if (functionId == TSDB_FUNC_SUM_RATE || functionId == TSDB_FUNC_SUM_IRATE || functionId == TSDB_FUNC_AVG_RATE ||
-        functionId == TSDB_FUNC_AVG_IRATE) {
-      return true;
-    }
-  }
-
-  return false;
-}
-
 static bool isFirstLastRowQuery(SQueryAttr *pQueryAttr) {
   for (int32_t i = 0; i < pQueryAttr->numOfOutput; ++i) {
     int32_t functionID = pQueryAttr->pExpr1[i].base.functionId;
diff --git a/src/tsdb/inc/tsdbCommitQueue.h b/src/tsdb/inc/tsdbCommitQueue.h
index 6342c036b77317f6d954bf63c32674f5fbe66de9..b690e3bdc25d86acf7e5b9d580470a80f3f4316f 100644
--- a/src/tsdb/inc/tsdbCommitQueue.h
+++ b/src/tsdb/inc/tsdbCommitQueue.h
@@ -16,7 +16,7 @@
 #ifndef _TD_TSDB_COMMIT_QUEUE_H_
 #define _TD_TSDB_COMMIT_QUEUE_H_
 
-typedef enum { COMMIT_REQ, COMPACT_REQ } TSDB_REQ_T;
+typedef enum { COMMIT_REQ, COMPACT_REQ,COMMIT_CONFIG_REQ } TSDB_REQ_T;
 
 int tsdbScheduleCommit(STsdbRepo *pRepo, TSDB_REQ_T req);
 
diff --git a/src/tsdb/inc/tsdbMemTable.h b/src/tsdb/inc/tsdbMemTable.h
index 6046274af40b855ac25dba6e220bf3bcfdc1dcca..babb7024b2500f3b8418fa5404bb593c768d8f1f 100644
--- a/src/tsdb/inc/tsdbMemTable.h
+++ b/src/tsdb/inc/tsdbMemTable.h
@@ -66,6 +66,7 @@ int   tsdbTakeMemSnapshot(STsdbRepo* pRepo, SMemSnapshot* pSnapshot, SArray* pAT
 void  tsdbUnTakeMemSnapShot(STsdbRepo* pRepo, SMemSnapshot* pSnapshot);
 void* tsdbAllocBytes(STsdbRepo* pRepo, int bytes);
 int   tsdbAsyncCommit(STsdbRepo* pRepo);
+int   tsdbSyncCommitConfig(STsdbRepo* pRepo);
 int   tsdbLoadDataFromCache(STable* pTable, SSkipListIterator* pIter, TSKEY maxKey, int maxRowsToRead, SDataCols* pCols,
                             TKEY* filterKeys, int nFilterKeys, bool keepDup, SMergeInfo* pMergeInfo);
 void* tsdbCommitData(STsdbRepo* pRepo);
diff --git a/src/tsdb/inc/tsdbint.h b/src/tsdb/inc/tsdbint.h
index 049c1bdb6ea37121a202a931faa17a4ea36cf6dc..7cf88826319b0b4ad8a7d128b19264d2b67434d0 100644
--- a/src/tsdb/inc/tsdbint.h
+++ b/src/tsdb/inc/tsdbint.h
@@ -78,7 +78,6 @@ struct STsdbRepo {
   bool            config_changed; // config changed flag
   pthread_mutex_t save_mutex;     // protect save config
   
-  uint8_t         hasCachedLastRow;
   uint8_t         hasCachedLastColumn;
 
   STsdbAppH       appH;
diff --git a/src/tsdb/src/tsdbCommitQueue.c b/src/tsdb/src/tsdbCommitQueue.c
index bb844e8e83f532e2c933ae35063460ec59129ee3..e25014bc1e8f2456eece3d517096cfee66886800 100644
--- a/src/tsdb/src/tsdbCommitQueue.c
+++ b/src/tsdb/src/tsdbCommitQueue.c
@@ -180,15 +180,14 @@ static void *tsdbLoopCommit(void *arg) {
     req = ((SReq *)pNode->data)->req;
     pRepo = ((SReq *)pNode->data)->pRepo;
 
-    // check if need to apply new config
-    if (pRepo->config_changed) {
-      tsdbApplyRepoConfig(pRepo);
-    }
-
     if (req == COMMIT_REQ) {
       tsdbCommitData(pRepo);
     } else if (req == COMPACT_REQ) {
       tsdbCompactImpl(pRepo);
+    } else if (req == COMMIT_CONFIG_REQ) {        
+      ASSERT(pRepo->config_changed);
+      tsdbApplyRepoConfig(pRepo);
+      tsem_post(&(pRepo->readyToCommit));
     } else {
       ASSERT(0);
     }
diff --git a/src/tsdb/src/tsdbMain.c b/src/tsdb/src/tsdbMain.c
index afbedd5b2fd231606902db104916e4ff4f10ba67..bb02e0128337dbd0436e3c8b83894097b1c21c4c 100644
--- a/src/tsdb/src/tsdbMain.c
+++ b/src/tsdb/src/tsdbMain.c
@@ -270,8 +270,8 @@ int32_t tsdbConfigRepo(STsdbRepo *repo, STsdbCfg *pCfg) {
 
   pthread_mutex_unlock(&repo->save_mutex);
 
-  // schedule a commit msg then the new config will be applied immediatly
-  tsdbAsyncCommit(repo);
+  // schedule a commit msg and wait for the new config applied
+  tsdbSyncCommitConfig(repo);
 
   return 0;
 #if 0
@@ -553,7 +553,6 @@ static STsdbRepo *tsdbNewRepo(STsdbCfg *pCfg, STsdbAppH *pAppH) {
     return NULL;
   }
   pRepo->config_changed = false;
-  atomic_store_8(&pRepo->hasCachedLastRow, 0);
   atomic_store_8(&pRepo->hasCachedLastColumn, 0);
 
   code = tsem_init(&(pRepo->readyToCommit), 0, 1);
@@ -857,9 +856,7 @@ int tsdbRestoreInfo(STsdbRepo *pRepo) {
   }
 
   tsdbDestroyReadH(&readh);
-  if (CACHE_LAST_ROW(pCfg)) {
-    atomic_store_8(&pRepo->hasCachedLastRow, 1);
-  }
+
   if (CACHE_LAST_NULL_COLUMN(pCfg)) {
     atomic_store_8(&pRepo->hasCachedLastColumn, 1);
   }
@@ -900,20 +897,16 @@ int tsdbCacheLastData(STsdbRepo *pRepo, STsdbCfg* oldCfg) {
 
   // if close last option,need to free data
   if (need_free_last_row || need_free_last_col) {
-    if (need_free_last_row) {
-      atomic_store_8(&pRepo->hasCachedLastRow, 0);
-    }
     if (need_free_last_col) {
       atomic_store_8(&pRepo->hasCachedLastColumn, 0);
     }
     tsdbInfo("free cache last data since cacheLast option changed");    
-    for (int i = 1; i < maxTableIdx; i++) {
+    for (int i = 1; i <= maxTableIdx; i++) {
       STable *pTable = pMeta->tables[i];
       if (pTable == NULL) continue;   
       if (need_free_last_row) {
         taosTZfree(pTable->lastRow);
         pTable->lastRow = NULL;
-        pTable->lastKey = TSKEY_INITIAL_VAL;
       }
       if (need_free_last_col) {
         tsdbFreeLastColumns(pTable);
@@ -983,9 +976,6 @@ int tsdbCacheLastData(STsdbRepo *pRepo, STsdbCfg* oldCfg) {
 
   tsdbDestroyReadH(&readh);
 
-  if (cacheLastRow) {
-    atomic_store_8(&pRepo->hasCachedLastRow, 1);
-  }
   if (cacheLastCol) {
     atomic_store_8(&pRepo->hasCachedLastColumn, 1);
   }
diff --git a/src/tsdb/src/tsdbMemTable.c b/src/tsdb/src/tsdbMemTable.c
index bee5600af730cda0d51c10dc969b070f7cd0252e..9d8b1ca7f2889f40b696f04a608dd166adf6eac6 100644
--- a/src/tsdb/src/tsdbMemTable.c
+++ b/src/tsdb/src/tsdbMemTable.c
@@ -271,10 +271,34 @@ void *tsdbAllocBytes(STsdbRepo *pRepo, int bytes) {
   return ptr;
 }
 
+int tsdbSyncCommitConfig(STsdbRepo* pRepo) {
+  ASSERT(pRepo->config_changed == true);
+  tsem_wait(&(pRepo->readyToCommit));
+
+  if (pRepo->code != TSDB_CODE_SUCCESS) {
+    tsdbWarn("vgId:%d try to commit config when TSDB not in good state: %s", REPO_ID(pRepo), tstrerror(terrno));
+  }
+
+  if (tsdbLockRepo(pRepo) < 0) return -1;
+  tsdbScheduleCommit(pRepo, COMMIT_CONFIG_REQ);
+  if (tsdbUnlockRepo(pRepo) < 0) return -1;
+
+  tsem_wait(&(pRepo->readyToCommit));
+  tsem_post(&(pRepo->readyToCommit));
+
+  if (pRepo->code != TSDB_CODE_SUCCESS) {
+    terrno = pRepo->code;
+    return -1;
+  }
+
+  terrno = TSDB_CODE_SUCCESS;
+  return 0;
+}
+
 int tsdbAsyncCommit(STsdbRepo *pRepo) {
   tsem_wait(&(pRepo->readyToCommit));
 
-  //ASSERT(pRepo->imem == NULL);
+  ASSERT(pRepo->imem == NULL);
   if (pRepo->mem == NULL) {
     tsem_post(&(pRepo->readyToCommit));
     return 0;
@@ -1015,7 +1039,6 @@ static int tsdbUpdateTableLatestInfo(STsdbRepo *pRepo, STable *pTable, SDataRow
     taosTZfree(pTable->lastRow);
     TSDB_WLOCK_TABLE(pTable);
     pTable->lastRow = NULL;
-    pTable->lastKey = TSKEY_INITIAL_VAL;
     TSDB_WUNLOCK_TABLE(pTable);
   }
 
diff --git a/src/tsdb/src/tsdbRead.c b/src/tsdb/src/tsdbRead.c
index 1545d44395d6baca6f33c850e35796c96af8d52f..c333294179f215890f06ae8d30bf6316f379f875 100644
--- a/src/tsdb/src/tsdbRead.c
+++ b/src/tsdb/src/tsdbRead.c
@@ -2469,7 +2469,6 @@ static bool loadCachedLastRow(STsdbQueryHandle* pQueryHandle) {
     if (ret != TSDB_CODE_SUCCESS) {
       return false;
     }
-
     copyOneRowFromMem(pQueryHandle, pQueryHandle->outputCapacity, 0, pRow, numOfCols, pCheckInfo->pTableObj, NULL);
     tfree(pRow);
 
@@ -2860,24 +2859,29 @@ bool tsdbGetExternalRow(TsdbQueryHandleT pHandle) {
 }
 
 /*
- * 1. no data at all (pTable->lastKey = TSKEY_INITIAL_VAL), just return TSKEY_INITIAL_VAL
- * 2. has data but not loaded, just return lastKey but not set pRes
- * 3. has data and loaded, return lastKey and set pRes
+ * if lastRow == NULL, return TSDB_CODE_TDB_NO_CACHE_LAST_ROW
+ * else set pRes and return TSDB_CODE_SUCCESS and save lastKey
  */
 int32_t tsdbGetCachedLastRow(STable* pTable, SDataRow* pRes, TSKEY* lastKey) {
+  int32_t code = TSDB_CODE_SUCCESS;
+
   TSDB_RLOCK_TABLE(pTable);
-  *lastKey = pTable->lastKey;
 
-  if ((*lastKey) != TSKEY_INITIAL_VAL && pTable->lastRow) {
+  if (!pTable->lastRow) {
+    code = TSDB_CODE_TDB_NO_CACHE_LAST_ROW;
+    goto out;
+  }
+
+  if (pRes) {
     *pRes = tdDataRowDup(pTable->lastRow);
     if (*pRes == NULL) {
-      TSDB_RUNLOCK_TABLE(pTable);
-      return TSDB_CODE_TDB_OUT_OF_MEMORY;
+      code = TSDB_CODE_TDB_OUT_OF_MEMORY;
     }
   }
 
+out:
   TSDB_RUNLOCK_TABLE(pTable);
-  return TSDB_CODE_SUCCESS;
+  return code;
 }
 
 bool isTsdbCacheLastRow(TsdbQueryHandleT* pQueryHandle) {
@@ -2887,7 +2891,6 @@ bool isTsdbCacheLastRow(TsdbQueryHandleT* pQueryHandle) {
 int32_t checkForCachedLastRow(STsdbQueryHandle* pQueryHandle, STableGroupInfo *groupList) {
   assert(pQueryHandle != NULL && groupList != NULL);
 
-  SDataRow pRow = NULL;
   TSKEY    key = TSKEY_INITIAL_VAL;
 
   SArray* group = taosArrayGetP(groupList->pGroupList, 0);
@@ -2898,7 +2901,7 @@ int32_t checkForCachedLastRow(STsdbQueryHandle* pQueryHandle, STableGroupInfo *g
   int32_t code = 0;
   
   if (((STable*)pInfo->pTable)->lastRow) {
-    code = tsdbGetCachedLastRow(pInfo->pTable, &pRow, &key);
+    code = tsdbGetCachedLastRow(pInfo->pTable, NULL, &key);
     if (code != TSDB_CODE_SUCCESS) {
       pQueryHandle->cachelastrow = 0;
     } else {
@@ -2913,7 +2916,6 @@ int32_t checkForCachedLastRow(STsdbQueryHandle* pQueryHandle, STableGroupInfo *g
     pQueryHandle->activeIndex = -1;  // start from -1
   }
 
-  tfree(pRow);
   return code;
 }
 
diff --git a/tests/examples/c/apitest.c b/tests/examples/c/apitest.c
index b2411d1212de3cb930ce6d7032e6b1f8ec0dcc5d..2961750efce3f1e746aa2e82ecb5160488065681 100644
--- a/tests/examples/c/apitest.c
+++ b/tests/examples/c/apitest.c
@@ -402,10 +402,6 @@ void verify_prepare(TAOS* taos) {
   taos_stmt_close(stmt);
 }
 
-
-
-
-
 void verify_prepare2(TAOS* taos) {
   TAOS_RES* result = taos_query(taos, "drop database if exists test;");
   taos_free_result(result);
@@ -531,10 +527,9 @@ void verify_prepare2(TAOS* taos) {
   params[9].is_null = is_null;
   params[9].num = 10;
 
-
-  sql = "insert into ? values(?,?,?,?,?,?,?,?,?,?)";
+  sql = "insert into ? (ts, b, v1, v2, v4, v8, f4, f8, bin, blob) values(?,?,?,?,?,?,?,?,?,?)";
   code = taos_stmt_prepare(stmt, sql, 0);
-  if (code != 0){
+  if (code != 0) {
     printf("\033[31mfailed to execute taos_stmt_prepare. code:0x%x\033[0m\n", code);
   }
 
@@ -577,9 +572,8 @@ void verify_prepare2(TAOS* taos) {
     printf("\033[31mfailed to execute insert statement.\033[0m\n");
     return;
   }
-  taos_stmt_close(stmt);
-
 
+  taos_stmt_close(stmt);
 
   // query the records
   stmt = taos_stmt_init(taos);
@@ -623,9 +617,16 @@ void verify_prepare2(TAOS* taos) {
 
   taos_free_result(result);
   taos_stmt_close(stmt);
-}
-
 
+  free(t8_len);
+  free(t16_len);
+  free(t32_len);
+  free(t64_len);
+  free(float_len);
+  free(double_len);
+  free(bin_len);
+  free(blob_len);
+}
 
 void verify_prepare3(TAOS* taos) {
   TAOS_RES* result = taos_query(taos, "drop database if exists test;");
@@ -810,7 +811,6 @@ void verify_prepare3(TAOS* taos) {
     blob_len[i] = (int32_t)strlen(v.blob[i]);
   }
 
-
   taos_stmt_bind_param_batch(stmt, params);
   taos_stmt_add_batch(stmt);
   
@@ -852,10 +852,12 @@ void verify_prepare3(TAOS* taos) {
   int         rows = 0;
   int         num_fields = taos_num_fields(result);
   TAOS_FIELD *fields = taos_fetch_fields(result);
-  char        temp[256];
+  char        temp[256] = {0};
 
   // fetch the records row by row
   while ((row = taos_fetch_row(result))) {
+    memset(temp, 0, sizeof(temp)/sizeof(temp[0]));
+
     rows++;
     taos_print_row(temp, row, fields, num_fields);
     printf("%s\n", temp);
@@ -863,9 +865,16 @@ void verify_prepare3(TAOS* taos) {
 
   taos_free_result(result);
   taos_stmt_close(stmt);
-}
-
 
+  free(t8_len);
+  free(t16_len);
+  free(t32_len);
+  free(t64_len);
+  free(float_len);
+  free(double_len);
+  free(bin_len);
+  free(blob_len);
+}
 
 void retrieve_callback(void *param, TAOS_RES *tres, int numOfRows)
 {
diff --git a/tests/pytest/alter/alter_keep.py b/tests/pytest/alter/alter_keep.py
new file mode 100644
index 0000000000000000000000000000000000000000..cb630963a7c26a531857f9a39ff715f83c14280d
--- /dev/null
+++ b/tests/pytest/alter/alter_keep.py
@@ -0,0 +1,146 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+from util.log import *
+from util.cases import *
+from util.sql import *
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+    
+    def alterKeepCommunity(self):
+        ## community accepts both 1 paramater, 2 parmaters and 3 paramaters
+        ## but paramaters other than paramater 1 will be ignored 
+        ## only paramater 1 will be used
+        tdSql.query('show databases')
+        tdSql.checkData(0,7,'3650,3650,3650')
+
+        tdSql.execute('alter database db keep 10')
+        tdSql.query('show databases')
+        tdSql.checkData(0,7,'10,10,10')
+
+        tdSql.execute('alter database db keep 50')
+        tdSql.query('show databases')
+        tdSql.checkData(0,7,'50,50,50')
+
+        tdSql.execute('alter database db keep 20')
+        tdSql.query('show databases')
+        tdSql.checkData(0,7,'20,20,20')
+
+        tdSql.execute('alter database db keep 100, 98 ,99')
+        tdSql.query('show databases')
+        tdSql.checkData(0,7,'100,100,100')
+
+        tdSql.execute('alter database db keep 99, 100 ,101')
+        tdSql.query('show databases')
+        tdSql.checkData(0,7,'99,99,99')
+
+        tdSql.execute('alter database db keep 200, 199 ,198')
+        tdSql.query('show databases')
+        tdSql.checkData(0,7,'200,200,200')
+
+        tdSql.execute('alter database db keep 4000,4001')
+        tdSql.query('show databases')
+        tdSql.checkData(0,7,'4000,4000,4000')
+
+        tdSql.execute('alter database db keep 5000,50')
+        tdSql.query('show databases')
+        tdSql.checkData(0,7,'5000,5000,5000')
+
+        tdSql.execute('alter database db keep 50,5000')
+        tdSql.query('show databases')
+        tdSql.checkData(0,7,'50,50,50')
+
+
+    def alterKeepEnterprise(self):
+        ## enterprise only accept three inputs
+        ## does not accept 1 paramaters nor 3 paramaters
+        tdSql.query('show databases')
+        tdSql.checkData(0,7,'3650,3650,3650')
+
+        tdSql.error('alter database db keep 10')
+        tdSql.query('show databases')
+        tdSql.checkData(0,7,'3650,3650,3650')
+
+        ## the order for altering keep is keep(D), keep0, keep1.
+        ## if the order is changed, please modify the following test
+        ## to make sure the the test is accurate
+
+        tdSql.execute('alter database db keep 10, 10 ,10')
+        tdSql.query('show databases')
+        tdSql.checkData(0,7,'10,10,10')
+
+        tdSql.execute('alter database db keep 100, 98 ,99')
+        tdSql.query('show databases')
+        tdSql.checkData(0,7,'98,99,100')
+
+        tdSql.execute('alter database db keep 200, 200 ,200')
+        tdSql.query('show databases')
+        tdSql.checkData(0,7,'200,200,200')
+
+        tdSql.error('alter database db keep 198, 199 ,200')
+        tdSql.query('show databases')
+        tdSql.checkData(0,7,'200,200,200')
+
+        # tdSql.execute('alter database db keep 3650,3650,3650')
+        # tdSql.error('alter database db keep 4000,3640')
+        # tdSql.error('alter database db keep 10,10')
+        # tdSql.query('show databases')
+        # tdSql.checkData(0,7,'3650,3650,3650')
+
+    def run(self):
+        tdSql.prepare()
+        selfPath = os.path.dirname(os.path.realpath(__file__))
+
+        if ("community" in selfPath):
+            tdLog.debug('running enterprise test')
+            self.alterKeepEnterprise()
+        else:
+            tdLog.debug('running community test')
+            self.alterKeepCommunity()
+        
+
+        ##TODO: need to wait for TD-4445 to implement the following
+        ##      tests
+        # tdSql.prepare()
+        # tdSql.execute('create table tb (ts timestamp, speed int)')
+        # tdSql.execute('alter database db keep 10,10,10')
+        # tdSql.execute('insert into tb values (now, 10)')
+        # tdSql.execute('insert into tb values (now + 10m, 10)')
+        # tdSql.query('select * from tb')
+        # tdSql.checkRows(2)
+        # tdSql.execute('alter database db keep 40,40,40')
+        # tdSql.query('show databases')
+        # tdSql.checkData(0,7,'40,40,40')
+        # tdSql.error('insert into tb values (now-60d, 10)')
+        # tdSql.execute('insert into tb values (now-30d, 10)')
+        # tdSql.query('select * from tb')
+        # tdSql.checkRows(3)
+        # tdSql.execute('alter database db keep 20,20,20')
+        # tdSql.query('show databases')
+        # tdSql.checkData(0,7,'20,20,20')
+        # tdSql.query('select * from tb')
+        # tdSql.checkRows(2)
+
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
diff --git a/tests/pytest/fulltest.sh b/tests/pytest/fulltest.sh
index 5e4f57e1a2db5984c13fafc8f8a046403914c900..8fed9aa81cc00029daab06df8a1652d79bae230f 100755
--- a/tests/pytest/fulltest.sh
+++ b/tests/pytest/fulltest.sh
@@ -338,6 +338,7 @@ python3 test.py -f tools/taosdemoAllTest/taosdemoTestInsertWithJson.py
 python3 test.py -f tools/taosdemoAllTest/taosdemoTestQueryWithJson.py
 python3 ./test.py -f tag_lite/drop_auto_create.py
 python3 test.py -f insert/insert_before_use_db.py
+python3 test.py -f alter/alter_keep.py
 python3 test.py -f alter/alter_cacheLastRow.py
 python3 test.py -f alter/alter_keep_exception.py
 #======================p4-end===============
diff --git a/tests/pytest/query/last_row_cache.py b/tests/pytest/query/last_row_cache.py
index a0e81477096e9c846e109ae71020b40e47b39a84..4aae4ce487d386b4963af32bca803d2feeb584d7 100644
--- a/tests/pytest/query/last_row_cache.py
+++ b/tests/pytest/query/last_row_cache.py
@@ -25,7 +25,7 @@ class TDTestCase:
 
         self.tables = 10
         self.rows = 20
-        self.columns = 50
+        self.columns = 5
         self.perfix = 't'
         self.ts = 1601481600000
     
@@ -34,7 +34,7 @@ class TDTestCase:
         sql = "create table st(ts timestamp, "
         for i in range(self.columns - 1):
             sql += "c%d int, " % (i + 1)
-        sql += "c50 int) tags(t1 int)"
+        sql += "c5 int) tags(t1 int)"
         tdSql.execute(sql)
         
         for i in range(self.tables):
@@ -148,15 +148,38 @@ class TDTestCase:
         self.executeQueries()
         self.insertData2()
         self.executeQueries2()
-        
+
         print("============== alter last cache")
         tdSql.execute("alter database test1 cachelast 1")                
         self.executeQueries2()
+        
+        tdSql.execute("alter database test1 cachelast 2")                
+        self.executeQueries2()
+
+        tdSql.execute("alter database test1 cachelast 3")                
+        self.executeQueries2()                
+
+        
+        print("============== alter last cache")
+        tdSql.execute("alter database test1 cachelast 0")                
+        self.executeQueries2()
+        tdDnodes.stop(1)
+        tdDnodes.start(1)
+        self.executeQueries2()
+
+        tdSql.execute("alter database test1 cachelast 1")        
+        self.executeQueries2()
+        tdDnodes.stop(1)
+        tdDnodes.start(1)
+        self.executeQueries2()
+
+        tdSql.execute("alter database test1 cachelast 2")        
+        self.executeQueries2()
         tdDnodes.stop(1)
         tdDnodes.start(1)
         self.executeQueries2()
 
-        tdSql.execute("alter database test1 cachelast 0")        
+        tdSql.execute("alter database test1 cachelast 3")        
         self.executeQueries2()
         tdDnodes.stop(1)
         tdDnodes.start(1)
@@ -174,10 +197,22 @@ class TDTestCase:
         self.executeQueries2()
         
         tdSql.execute("alter database test2 cachelast 0")        
+        self.executeQueries2()                
+
+        tdSql.execute("alter database test2 cachelast 1")        
+        self.executeQueries2()
+
+        tdSql.execute("alter database test2 cachelast 2")        
+        self.executeQueries2()                
+
+        tdSql.execute("alter database test2 cachelast 3")        
         self.executeQueries2()
+
+        tdSql.execute("alter database test2 cachelast 0")        
+        self.executeQueries2() 
         tdDnodes.stop(1)
         tdDnodes.start(1)
-        self.executeQueries2()
+        self.executeQueries2()               
 
         tdSql.execute("alter database test2 cachelast 1")        
         self.executeQueries2()
@@ -185,6 +220,21 @@ class TDTestCase:
         tdDnodes.start(1)
         self.executeQueries2()
 
+        tdSql.execute("alter database test2 cachelast 2")        
+        self.executeQueries2()
+        tdDnodes.stop(1)
+        tdDnodes.start(1)
+        self.executeQueries2()                
+
+        tdSql.execute("alter database test2 cachelast 3")        
+        self.executeQueries2()
+        tdDnodes.stop(1)
+        tdDnodes.start(1)
+        self.executeQueries2()
+        
+        tdSql.query("select last_row(*) from st group by tbname")
+        tdSql.checkRows(10)        
+
     def stop(self):
         tdSql.close()
         tdLog.success("%s successfully executed" % __file__)
diff --git a/tests/script/general/parser/function.sim b/tests/script/general/parser/function.sim
index ee5a750c88ede5e373c47796c1bc9d373f223e19..591d5d15351c5b110470287d05127f630d7d1979 100644
--- a/tests/script/general/parser/function.sim
+++ b/tests/script/general/parser/function.sim
@@ -814,3 +814,121 @@ if $data00 != 1 then
 endi
 
 print ====================> TODO stddev + normal column filter
+
+
+print ====================> irate
+sql select irate(k) from t1
+if $rows != 1 then
+  return -1
+endi
+
+if $data00 != 0.000027778 then
+  return -1
+endi
+
+sql select irate(k) from t1 where ts>='2015-8-18 00:30:00.000'
+if $rows != 1 then
+  return -1
+endi
+
+if $data00 != 0.000000000 then
+  print expect 0.000000000, actual $data00
+  return -1
+endi
+
+sql select irate(k) from t1 where ts>='2015-8-18 00:06:00.000' and ts<='2015-8-18 00:12:000';
+if $rows != 1 then
+  return -1
+endi
+
+if $data00 != 0.005633334 then
+  return -1
+endi
+
+sql select irate(k) from t1 interval(10a)
+if $rows != 6 then
+  return -1
+endi
+
+if $data01 != 0.000000000 then
+  return -1
+endi
+
+if $data11 != 0.000000000 then
+  return -1
+endi
+
+if $data51 != 0.000000000 then
+  return -1
+endi
+
+sql select count(*),irate(k) from t1 interval(10m)
+if $rows != 4 then
+  return -1
+endi
+
+if $data00 != @15-08-18 00:00:00.000@ then
+  return -1
+endi
+
+if $data01 != 2 then
+  return -1
+endi
+
+if $data02 != 0.000144445 then
+  return -1
+endi
+
+if $data10 != @15-08-18 00:10:00.000@ then
+  return -1
+endi
+
+if $data11 != 2 then
+  return -1
+endi
+
+if $data12 != 0.000272222 then
+  return -1
+endi
+
+if $data20 != @15-08-18 00:20:00.000@ then
+  return -1
+endi
+
+if $data21 != 1 then
+  return -1
+endi
+
+if $data22 != 0.000000000 then
+  return -1
+endi
+
+if $data30 != @15-08-18 00:30:00.000@ then
+  return -1
+endi
+
+if $data31 != 1 then
+  return -1
+endi
+
+if $data32 != 0.000000000 then
+  return -1
+endi
+
+sql select count(*),irate(k) from t1 interval(10m) order by ts desc
+if $rows != 4 then
+  return -1
+endi
+
+if $data30 != @15-08-18 00:00:00.000@ then
+  return -1
+endi
+
+if $data31 != 2 then
+  return -1
+endi
+
+if $data32 != 0.000144445 then
+  return -1
+endi
+
diff --git a/tests/script/general/parser/nestquery.sim b/tests/script/general/parser/nestquery.sim
index 3d13ff504db8e86ceaed368b237e0a834987e53e..16d190d3fe174e2c19960999584baa7352f555aa 100644
--- a/tests/script/general/parser/nestquery.sim
+++ b/tests/script/general/parser/nestquery.sim
@@ -124,6 +124,27 @@ if $rows != 2 then
   return -1
 endi
 
+sql select * from (select count(*) a, tbname f1 from nest_mt0 group by tbname) t where t.a<0 and f1 = 'nest_tb0';
+if $rows != 0 then
+  return -1
+endi
+
+sql select * from (select count(*) a, tbname f1 from nest_mt0 group by tbname) t where t.a>0 and f1 = 'nest_tb0';
+if $rows != 1 then
+  return -1
+endi
+
+if $data00 != 10000 then
+  return -1
+endi
+
+if $data01 != @nest_tb0@ then
+  return -1
+endi
+
+if $data02 != @nest_tb0@ then
+  return -1
+endi
 
 print ===================> nest query interval