Merge pull request #3082 from taosdata/feature/os

TD-1047 iconv compile options

cmake/define.inc

@@ -33,11 +33,7 @@ IF (TD_LINUX_64)
   ADD_DEFINITIONS(-D_M_X64)
   ADD_DEFINITIONS(-D_TD_LINUX_64)
   SET(COMMON_FLAGS "-std=gnu99 -Wall -Werror -fPIC -g3 -gdwarf-2 -msse4.2 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
-  
-  FIND_PATH(ICONV_INCLUDE_EXIST iconv.h /usr/include/ /usr/local/include/)
-  IF (ICONV_INCLUDE_EXIST)
-    ADD_DEFINITIONS(-DUSE_LIBICONV)
-  ENDIF ()
+  ADD_DEFINITIONS(-DUSE_LIBICONV)
 ENDIF ()
 
 IF (TD_LINUX_32)
@@ -50,6 +46,7 @@ IF (TD_ARM_64)
   ADD_DEFINITIONS(-D_M_X64)
   ADD_DEFINITIONS(-D_TD_ARM_64_)
   ADD_DEFINITIONS(-D_TD_ARM_)
+  ADD_DEFINITIONS(-DUSE_LIBICONV)
   SET(COMMON_FLAGS "-std=gnu99 -Wall -Werror -fPIC -g -fsigned-char -fpack-struct=8 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILE")
 ENDIF ()
 
@@ -133,6 +130,7 @@ ENDIF ()
 
 IF (TD_WINDOWS_32)
   ADD_DEFINITIONS(-D_TD_WINDOWS_32)
+  ADD_DEFINITIONS(-DUSE_LIBICONV)
 ENDIF ()
 
 INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)

src/tsdb/src/tsdbRead.c

@@ -1795,19 +1795,22 @@ bool tsdbNextDataBlock(TsdbQueryHandleT* pHandle) {
 
   if (pQueryHandle->checkFiles) {
     bool exists = true;
+
     int32_t code = getDataBlocksInFiles(pQueryHandle, &exists);
     if (code != TSDB_CODE_SUCCESS) {
-      return code;
+      pQueryHandle->activeIndex = 0;
+      pQueryHandle->checkFiles = false;
+
+      return false;
     }
 
     if (exists) {
-      elapsedTime = taosGetTimestampUs() - stime;
-      pQueryHandle->cost.checkForNextTime += elapsedTime;
+      pQueryHandle->cost.checkForNextTime += (taosGetTimestampUs() - stime);
       return exists;
     }
 
     pQueryHandle->activeIndex = 0;
-    pQueryHandle->checkFiles  = false;
+    pQueryHandle->checkFiles = false;
   }
 
   // TODO: opt by consider the scan order

tests/script/jenkins/basic.txt

@@ -135,7 +135,6 @@ cd ../../../debug; make
 ./test.sh -f general/parser/limit2.sim
 ./test.sh -f general/parser/fill.sim
 ./test.sh -f general/parser/fill_stb.sim
-#./test.sh -f general/parser/fill_us.sim
 ./test.sh -f general/parser/where.sim
 ./test.sh -f general/parser/slimit.sim
 ./test.sh -f general/parser/select_with_tags.sim
@@ -143,7 +142,6 @@ cd ../../../debug; make
 ./test.sh -f general/parser/tags_dynamically_specifiy.sim
 ./test.sh -f general/parser/groupby.sim
 ./test.sh -f general/parser/set_tag_vals.sim
-#./test.sh -f general/parser/sliding.sim
 ./test.sh -f general/parser/tags_filter.sim
 ./test.sh -f general/parser/slimit_alter_tags.sim
 ./test.sh -f general/parser/join.sim
@@ -151,6 +149,8 @@ cd ../../../debug; make
 ./test.sh -f general/parser/binary_escapeCharacter.sim
 ./test.sh -f general/parser/bug.sim
 ./test.sh -f general/parser/repeatAlter.sim
+./test.sh -f general/parser/union.sim
+./test.sh -f general/parser/topbot.sim
 
 ./test.sh -f general/stable/disk.sim
 ./test.sh -f general/stable/dnode3.sim