diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
index 35709237c00bbea769d07b81f827dec9b5de263c..ed6120bd30a622e79ad7f89693268bcde4c276d8 100644
--- a/contrib/CMakeLists.txt
+++ b/contrib/CMakeLists.txt
@@ -79,8 +79,8 @@ endif(${BUILD_WITH_LEVELDB})
 
 # rocksdb
 #if(${BUILD_WITH_ROCKSDB})
-    cat("${TD_SUPPORT_DIR}/rocksdb_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
-    add_definitions(-DUSE_ROCKSDB)
+cat("${TD_SUPPORT_DIR}/rocksdb_CMakeLists.txt.in" ${CONTRIB_TMP_FILE})
+add_definitions(-DUSE_ROCKSDB)
 #endif(${BUILD_WITH_ROCKSDB})
 
 # canonical-raft
@@ -222,7 +222,7 @@ endif(${BUILD_WITH_LEVELDB})
 
 # rocksdb
 # To support rocksdb build on ubuntu: sudo apt-get install libgflags-dev
-if(${BUILD_WITH_ROCKSDB})
+#if(${BUILD_WITH_ROCKSDB})
     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=maybe-uninitialized")
     option(WITH_TESTS "" OFF)
     option(WITH_BENCHMARK_TOOLS "" OFF)
@@ -234,7 +234,7 @@ if(${BUILD_WITH_ROCKSDB})
         rocksdb
         PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/rocksdb/include>
     )
-endif(${BUILD_WITH_ROCKSDB})
+#endif(${BUILD_WITH_ROCKSDB})
 
 # lucene
 # To support build on ubuntu: sudo apt-get install libboost-all-dev
diff --git a/source/dnode/vnode/src/tsdb/tsdbCacheRead.c b/source/dnode/vnode/src/tsdb/tsdbCacheRead.c
index 285e668e12dc18fc015167073ceb041b2e641dba..d74d9414e5cf45900965f3ed09000086821ce8d2 100644
--- a/source/dnode/vnode/src/tsdb/tsdbCacheRead.c
+++ b/source/dnode/vnode/src/tsdb/tsdbCacheRead.c
@@ -30,27 +30,8 @@ static int32_t saveOneRow(SArray* pRow, SSDataBlock* pBlock, SCacheRowsReader* p
     for (int32_t i = 0; i < pReader->numOfCols; ++i) {
       SColumnInfoData* pColInfoData = taosArrayGet(pBlock->pDataBlock, dstSlotIds[i]);
       SFirstLastRes*   p = (SFirstLastRes*)varDataVal(pRes[dstSlotIds[i]]);
-      /*
-      if (slotIds[i] == -1) {  // the primary timestamp
-        SLastCol* pColVal = (SLastCol*)taosArrayGet(pRow, 0);
-        p->ts = pColVal->ts;
-        p->bytes = TSDB_KEYSIZE;
-        *(int64_t*)p->buf = pColVal->ts;
-        allNullRow = false;
-      } else {
-      */
-      int32_t slotId = slotIds[i];
-      // add check for null value, caused by the modification of table schema (new column added).
-      /*
-      if (slotId >= taosArrayGetSize(pRow)) {
-        p->ts = 0;
-        p->isNull = true;
-        colDataSetNULL(pColInfoData, numOfRows);
-        continue;
-      }
-      */
-      // SLastCol* pColVal = (SLastCol*)taosArrayGet(pRow, slotId);
-      SLastCol* pColVal = (SLastCol*)taosArrayGet(pRow, i);
+      int32_t          slotId = slotIds[i];
+      SLastCol*        pColVal = (SLastCol*)taosArrayGet(pRow, i);
 
       p->ts = pColVal->ts;
       p->isNull = !COL_VAL_IS_VALUE(&pColVal->colVal);
@@ -66,7 +47,6 @@ static int32_t saveOneRow(SArray* pRow, SSDataBlock* pBlock, SCacheRowsReader* p
           p->bytes = pReader->pSchema->columns[slotId].bytes;
         }
       }
-      //}
 
       // pColInfoData->info.bytes includes the VARSTR_HEADER_SIZE, need to substruct it
       p->hasResult = true;
@@ -77,32 +57,22 @@ static int32_t saveOneRow(SArray* pRow, SSDataBlock* pBlock, SCacheRowsReader* p
     pBlock->info.rows += allNullRow ? 0 : 1;
   } else if (HASTYPE(pReader->type, CACHESCAN_RETRIEVE_LAST_ROW)) {
     for (int32_t i = 0; i < pReader->numOfCols; ++i) {
-      SColumnInfoData* pColInfoData = taosArrayGet(pBlock->pDataBlock, i);
+      SColumnInfoData* pColInfoData = taosArrayGet(pBlock->pDataBlock, dstSlotIds[i]);
 
-      if (slotIds[i] == -1) {
-        SLastCol* pColVal = (SLastCol*)taosArrayGet(pRow, 0);
-        colDataSetVal(pColInfoData, numOfRows, (const char*)&pColVal->ts, false);
-      } else {
-        int32_t slotId = slotIds[i];
-        // add check for null value, caused by the modification of table schema (new column added).
-        if (slotId >= taosArrayGetSize(pRow)) {
-          colDataSetNULL(pColInfoData, numOfRows);
-          continue;
-        }
-        SLastCol* pColVal = (SLastCol*)taosArrayGet(pRow, slotId);
-        SColVal*  pVal = &pColVal->colVal;
+      int32_t   slotId = slotIds[i];
+      SLastCol* pColVal = (SLastCol*)taosArrayGet(pRow, i);
+      SColVal*  pVal = &pColVal->colVal;
 
-        if (IS_VAR_DATA_TYPE(pColVal->colVal.type)) {
-          if (!COL_VAL_IS_VALUE(&pColVal->colVal)) {
-            colDataSetNULL(pColInfoData, numOfRows);
-          } else {
-            varDataSetLen(pReader->transferBuf[slotId], pVal->value.nData);
-            memcpy(varDataVal(pReader->transferBuf[slotId]), pVal->value.pData, pVal->value.nData);
-            colDataSetVal(pColInfoData, numOfRows, pReader->transferBuf[slotId], false);
-          }
+      if (IS_VAR_DATA_TYPE(pColVal->colVal.type)) {
+        if (!COL_VAL_IS_VALUE(&pColVal->colVal)) {
+          colDataSetNULL(pColInfoData, numOfRows);
         } else {
-          colDataSetVal(pColInfoData, numOfRows, (const char*)&pVal->value.val, !COL_VAL_IS_VALUE(pVal));
+          varDataSetLen(pReader->transferBuf[dstSlotIds[i]], pVal->value.nData);
+          memcpy(varDataVal(pReader->transferBuf[dstSlotIds[i]]), pVal->value.pData, pVal->value.nData);
+          colDataSetVal(pColInfoData, numOfRows, pReader->transferBuf[dstSlotIds[i]], false);
         }
+      } else {
+        colDataSetVal(pColInfoData, numOfRows, (const char*)&pVal->value.val, !COL_VAL_IS_VALUE(pVal));
       }
     }