Merge pull request #1284 from taosdata/feature/liaohj

Feature/liaohj

src/system/detail/src/vnodeQueryImpl.c

@@ -1148,10 +1148,11 @@ SCacheBlock *getCacheDataBlock(SMeterObj *pMeterObj, SQueryRuntimeEnv *pRuntimeE
 
   SCacheBlock *pNewBlock = &pRuntimeEnv->cacheBlock;
 
-  // the commit data points will be ignored
   int32_t offset = 0;
   int32_t numOfPoints = pNewBlock->numOfPoints;
-  if (pQuery->firstSlot == pQuery->commitSlot) {
+  
+  // the commit data points will be ignored
+  if (slot == pQuery->commitSlot) {
     assert(pQuery->commitPoint >= 0 && pQuery->commitPoint <= pNewBlock->numOfPoints);
 
     offset = pQuery->commitPoint;
@@ -1737,12 +1738,16 @@ static void doBlockwiseApplyFunctions(SQueryRuntimeEnv *pRuntimeEnv, SWindowStat
 
   if (IS_MASTER_SCAN(pRuntimeEnv) || pStatus->closed) {
     for (int32_t k = 0; k < pQuery->numOfOutputCols; ++k) {
+      int32_t functionId = pQuery->pSelectExpr[k].pBase.functionId;
+      
       pCtx[k].nStartQueryTimestamp = pWin->skey;
       pCtx[k].size = forwardStep;
       pCtx[k].startOffset = (QUERY_IS_ASC_QUERY(pQuery)) ? startPos : startPos - (forwardStep - 1);
-      pCtx[k].ptsList = (TSKEY *)((char*)pRuntimeEnv->primaryColBuffer->data + pCtx[k].startOffset * TSDB_KEYSIZE);
   
-      int32_t functionId = pQuery->pSelectExpr[k].pBase.functionId;
+      if ((aAggs[functionId].nStatus & TSDB_FUNCSTATE_SELECTIVITY) != 0) {
+        pCtx[k].ptsList = (TSKEY *)((char*)pRuntimeEnv->primaryColBuffer->data + pCtx[k].startOffset * TSDB_KEYSIZE);
+      }
+  
       if (functionNeedToExecute(pRuntimeEnv, &pCtx[k], functionId)) {
         aAggs[functionId].xFunction(&pCtx[k]);
       }