<fix>: merge conflict of tsdbRead.c , take master

src/kit/taosdemo/CMakeLists.txt

@@ -47,11 +47,11 @@ MESSAGE("taosdemo's status is:" ${TAOSDEMO_STATUS})
 ADD_DEFINITIONS(-DTAOSDEMO_COMMIT_SHA1="${TAOSDEMO_COMMIT_SHA1}")
 ADD_DEFINITIONS(-DTAOSDEMO_STATUS="${TAOSDEMO_STATUS}")
 
-MESSAGE("VERNUMBER is:" ${VERNUMBER})
-IF ("${VERNUMBER}" STREQUAL "")
+MESSAGE("TD_VER_NUMBER is:" ${TD_VER_NUMBER})
+IF ("${TD_VER_NUMBER}" STREQUAL "")
     SET(TD_VERSION_NUMBER "TDengine-version-unknown")
 ELSE()
-    SET(TD_VERSION_NUMBER ${VERNUMBER})
+    SET(TD_VERSION_NUMBER ${TD_VER_NUMBER})
 ENDIF ()
 MESSAGE("TD_VERSION_NUMBER is:" ${TD_VERSION_NUMBER})
 ADD_DEFINITIONS(-DTD_VERNUMBER="${TD_VERSION_NUMBER}")

src/kit/taosdump/CMakeLists.txt

@@ -52,11 +52,11 @@ MESSAGE("taosdump's status is:" ${TAOSDUMP_STATUS})
 ADD_DEFINITIONS(-DTAOSDUMP_COMMIT_SHA1="${TAOSDUMP_COMMIT_SHA1}")
 ADD_DEFINITIONS(-DTAOSDUMP_STATUS="${TAOSDUMP_STATUS}")
 
-MESSAGE("VERNUMBER is:" ${VERNUMBER})
-IF ("${VERNUMBER}" STREQUAL "")
+MESSAGE("TD_VER_NUMBER is:" ${TD_VER_NUMBER})
+IF ("${TD_VER_NUMBER}" STREQUAL "")
     SET(TD_VERSION_NUMBER "TDengine-version-unknown")
 ELSE()
-    SET(TD_VERSION_NUMBER ${VERNUMBER})
+    SET(TD_VERSION_NUMBER ${TD_VER_NUMBER})
 ENDIF ()
 MESSAGE("TD_VERSION_NUMBER is:" ${TD_VERSION_NUMBER})
 ADD_DEFINITIONS(-DTD_VERNUMBER="${TD_VERSION_NUMBER}")

src/tsdb/src/tsdbRead.c

@@ -804,14 +804,16 @@ static TSKEY extractFirstTraverseKey(STableCheckInfo* pCheckInfo, int32_t order,
     if(update == TD_ROW_DISCARD_UPDATE){
       pCheckInfo->chosen = CHECKINFO_CHOSEN_IMEM;
       tSkipListIterNext(pCheckInfo->iter);
+      return r2;
     }
     else if(update == TD_ROW_OVERWRITE_UPDATE) {
       pCheckInfo->chosen = CHECKINFO_CHOSEN_MEM;
       tSkipListIterNext(pCheckInfo->iiter);
+      return r1;
     } else {
       pCheckInfo->chosen = CHECKINFO_CHOSEN_BOTH;
+      return r1;
     }
-    return r1;
   } else {
     if (ASCENDING_TRAVERSE(order)) {
       if (r1 < r2) {
@@ -830,7 +832,6 @@ static TSKEY extractFirstTraverseKey(STableCheckInfo* pCheckInfo, int32_t order,
         return r1;
       }
     }
-    
   }
 }