Merge pull request #1810 from taosdata/newmaster/lihui

Newmaster/lihui

CMakeLists.txt

@@ -53,6 +53,7 @@ IF (NOT DEFINED TD_CLUSTER)
   SET(TD_MIPS_32 FALSE)
   SET(TD_DARWIN_64 FALSE)
   SET(TD_WINDOWS_64 FALSE)
+  SET(TD_WINDOWS_32 FALSE)
   SET(TD_PAGMODE_LITE FALSE)
   
   IF (${PAGMODE} MATCHES "lite")
@@ -127,6 +128,11 @@ IF (NOT DEFINED TD_CLUSTER)
       SET(TD_OS_DIR ${TD_COMMUNITY_DIR}/src/os/windows)
       ADD_DEFINITIONS(-D_M_X64)
       MESSAGE(STATUS "The current platform is Windows 64-bit")
+    ELSEIF(${CMAKE_SIZEOF_VOID_P} MATCHES 4)
+      SET(TD_WINDOWS_32 TRUE)
+      SET(TD_OS_DIR ${TD_COMMUNITY_DIR}/src/os/windows)
+      #ADD_DEFINITIONS(-D_M_X64)
+      MESSAGE(STATUS "The current platform is Windows 32-bit")
     ELSE ()
       MESSAGE(FATAL_ERROR "The current platform is Windows 32-bit, not supported yet")
       EXIT ()
@@ -194,7 +200,7 @@ IF (NOT DEFINED TD_CLUSTER)
       link_library(/usr/lib/libargp.a)
       ADD_DEFINITIONS(-D_ALPINE)
     ENDIF ()
-  ELSEIF (TD_WINDOWS_64)
+  ELSEIF (TD_WINDOWS_64 OR TD_WINDOWS_32)
     SET(CMAKE_GENERATOR "NMake Makefiles" CACHE INTERNAL "" FORCE)
     IF (NOT TD_GODLL)
       SET(COMMON_FLAGS "/nologo /WX- /Oi /Oy- /Gm- /EHsc /MT /GS /Gy /fp:precise /Zc:wchar_t /Zc:forScope /Gd /errorReport:prompt /analyze-")
@@ -235,7 +241,7 @@ IF (NOT DEFINED TD_CLUSTER)
   ELSEIF (${CMAKE_BUILD_TYPE} MATCHES "Release")
     MESSAGE(STATUS "Build Release Version")
   ELSE ()
-    IF (TD_WINDOWS_64)
+    IF (TD_WINDOWS_64 OR TD_WINDOWS_32)
       SET(CMAKE_BUILD_TYPE "Release")
       MESSAGE(STATUS "Build Release Version in Windows as default")
     ELSE ()
@@ -268,7 +274,7 @@ IF (NOT DEFINED TD_CLUSTER)
     INSTALL(CODE "MESSAGE(\"make install script: ${TD_MAKE_INSTALL_SH}\")")
     INSTALL(CODE "execute_process(COMMAND chmod 777 ${TD_MAKE_INSTALL_SH})")
     INSTALL(CODE "execute_process(COMMAND ${TD_MAKE_INSTALL_SH} ${TD_COMMUNITY_DIR} ${PROJECT_BINARY_DIR})")  
-  ELSEIF (TD_WINDOWS_64)
+  ELSEIF (TD_WINDOWS_64 OR TD_WINDOWS_32)
     SET(CMAKE_INSTALL_PREFIX C:/TDengine)
     IF (NOT TD_GODLL)
       INSTALL(DIRECTORY ${TD_COMMUNITY_DIR}/src/connector/go DESTINATION connector)

dirent @ c885633e

+Subproject commit c885633e126a3a949ec0497273ec13e2c03e862c

deps/iconv/CMakeLists.txt

 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 PROJECT(TDengine)
 
-IF (TD_WINDOWS_64)
+IF (TD_WINDOWS_64 OR TD_WINDOWS_32)
   LIST(APPEND SRC iconv.c)
   LIST(APPEND SRC localcharset.c)
   INCLUDE_DIRECTORIES(.)

deps/pthread/CMakeLists.txt

 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 PROJECT(TDengine)
 
-IF (TD_WINDOWS_64)
+IF (TD_WINDOWS_64 OR TD_WINDOWS_32)
   INCLUDE_DIRECTORIES(.)
   LIST(APPEND SRC pthread.c)
   ADD_LIBRARY(pthread ${SRC})

deps/regex/CMakeLists.txt

 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 PROJECT(TDengine)
 
-IF (TD_WINDOWS_64)
+IF (TD_WINDOWS_64 OR TD_WINDOWS_32)
   INCLUDE_DIRECTORIES(inc .)
   LIST(APPEND SRC regex.c)
   ADD_LIBRARY(regex ${SRC})

src/client/CMakeLists.txt

@@ -31,7 +31,7 @@ IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
   MESSAGE(STATUS "build version ${VERSION_INFO}")
   SET_TARGET_PROPERTIES(taos PROPERTIES VERSION ${VERSION_INFO} SOVERSION 1)
   
-ELSEIF (TD_WINDOWS_64)
+ELSEIF (TD_WINDOWS_64 OR TD_WINDOWS_32)
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/jni/windows)
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/jni/windows/win32)
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/pthread)

src/inc/taosmsg.h

@@ -439,9 +439,15 @@ typedef struct SSqlFuncExprMsg {
 } SSqlFuncExprMsg;
 
 typedef struct SSqlBinaryExprInfo {
-  struct tSQLBinaryExpr *pBinExpr;    /*  for binary expression */
+  union {
+    struct tSQLBinaryExpr *pBinExpr;    /*  for binary expression */
+    int64_t resvSpace0;
+  };  
   int32_t                numOfCols;   /*  binary expression involves the readed number of columns*/
-  SColIndexEx *          pReqColumns; /*  source column list */
+  union {
+    SColIndexEx *          pReqColumns; /*  source column list */
+    int64_t resvSpace1;
+  };
 } SSqlBinaryExprInfo;
 
 typedef struct SSqlFunctionExpr {
@@ -481,8 +487,12 @@ typedef struct SColumnInfo {
   int16_t            colId;
   int16_t            type;
   int16_t            bytes;
-  int16_t            numOfFilters;
-  SColumnFilterInfo *filters;
+  int16_t            numOfFilters;  
+  union {
+    SColumnFilterInfo *filters;
+    int64_t resvSpace;
+  };
+  
 } SColumnInfo;
 
 /*

src/kit/shell/CMakeLists.txt

@@ -19,7 +19,7 @@ IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
   ENDIF ()
   
   SET_TARGET_PROPERTIES(shell PROPERTIES OUTPUT_NAME taos)
-ELSEIF (TD_WINDOWS_64)
+ELSEIF (TD_WINDOWS_64 OR TD_WINDOWS_32)
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/pthread)
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/regex)
   LIST(APPEND SRC ./src/shellEngine.c)

src/os/windows/CMakeLists.txt

 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 PROJECT(TDengine)
 
-IF (TD_WINDOWS_64)
+IF (TD_WINDOWS_64 OR TD_WINDOWS_32)
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/pthread)
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
   INCLUDE_DIRECTORIES(inc)

src/os/windows/inc/os.h

@@ -142,8 +142,11 @@ extern "C" {
 #define atomic_exchange_16(ptr, val) _InterlockedExchange16((short volatile*)(ptr), (short)(val))
 #define atomic_exchange_32(ptr, val) _InterlockedExchange((long volatile*)(ptr), (long)(val))
 #define atomic_exchange_64(ptr, val) _InterlockedExchange64((__int64 volatile*)(ptr), (__int64)(val))
-#define atomic_exchange_ptr(ptr, val) _InterlockedExchangePointer((void* volatile*)(ptr), (void*)(val))
-
+#if (_MSC_VER == 1800)
+	#define atomic_exchange_ptr(ptr, val) InterlockedExchangePointer((void* volatile*)(ptr), (void*)(val))
+#else
+	#define atomic_exchange_ptr(ptr, val) _InterlockedExchangePointer((void* volatile*)(ptr), (void*)(val))
+#endif
 #ifdef _TD_GO_DLL_
   #define atomic_val_compare_exchange_8 __sync_val_compare_and_swap
 #else

src/os/windows/src/twindows.c

@@ -93,7 +93,11 @@ long interlocked_add_fetch_32(long volatile* ptr, long val) {
 }
 
 __int64 interlocked_add_fetch_64(__int64 volatile* ptr, __int64 val) {
+#ifdef _WIN64
   return _InterlockedExchangeAdd64(ptr, val) + val;
+#else
+  return _InterlockedExchangeAdd(ptr, val) + val;
+#endif
 }
 
 // and
@@ -377,9 +381,29 @@ int fsendfile(FILE* out_file, FILE* in_file, int64_t* offset, int32_t count) {
   return writeLen;
 }
 
+unsigned char _MyBitScanForward64(unsigned long *ret, uint64_t x) {
+  unsigned long x0 = (unsigned long)x, top, bottom;
+  _BitScanForward(&top, (unsigned long)(x >> 32));
+  _BitScanForward(&bottom, x0);
+  *ret = x0 ? bottom : 32 + top;
+  return x != 0;
+}
+
+unsigned char _MyBitScanReverse64(unsigned long *ret, uint64_t x) {
+  unsigned long x1 = (unsigned long)(x >> 32), top, bottom;
+  _BitScanReverse(&top, x1);
+  _BitScanReverse(&bottom, (unsigned long)x);
+  *ret = x1 ? top + 32 : bottom;
+  return x != 0;
+}
+
 int32_t BUILDIN_CLZL(uint64_t val) {
   unsigned long r = 0;
+#ifdef _WIN64
   _BitScanReverse64(&r, val);
+#else
+  _MyBitScanReverse64(&r, val);
+#endif
   return (int)(r >> 3);
 }
 
@@ -391,7 +415,11 @@ int32_t BUILDIN_CLZ(uint32_t val) {
 
 int32_t BUILDIN_CTZL(uint64_t val) {
   unsigned long r = 0;
+#ifdef _WIN64
   _BitScanForward64(&r, val);
+#else
+  _MyBitScanForward64(&r, val);
+#endif
   return (int)(r >> 3);
 }
 

src/rpc/CMakeLists.txt

@@ -12,7 +12,7 @@ ELSEIF (TD_DARWIN_64)
   LIST(APPEND SRC ./src/trpc.c)
   LIST(APPEND SRC ./src/tstring.c)
   LIST(APPEND SRC ./src/tudp.c)
-ELSEIF (TD_WINDOWS_64)
+ELSEIF (TD_WINDOWS_64 OR TD_WINDOWS_32)
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/pthread)
   LIST(APPEND SRC ./src/thaship.c)
   LIST(APPEND SRC ./src/trpc.c)

src/system/detail/src/vnodeQueryImpl.c

@@ -35,6 +35,8 @@
 #include "vnodeQueryImpl.h"
 #include "vnodeStatus.h"
 
+#include <dirent.h>
+
 enum {
   TS_JOIN_TS_EQUAL = 0,
   TS_JOIN_TS_NOT_EQUALS = 1,

src/system/detail/src/vnodeStore.c

@@ -24,6 +24,8 @@
 #include "vnodeUtil.h"
 #include "vnodeStatus.h"
 
+#include <dirent.h>
+
 int        tsMaxVnode = -1;
 int        tsOpenVnodes = 0;
 SVnodeObj *vnodeList = NULL;

src/util/CMakeLists.txt

@@ -28,7 +28,7 @@ IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
       MESSAGE(STATUS "Failed to find iconv, use default encoding method")
     ENDIF ()
   ENDIF ()
-ELSEIF (TD_WINDOWS_64)
+ELSEIF (TD_WINDOWS_64 OR TD_WINDOWS_32)
   ADD_DEFINITIONS(-DUSE_LIBICONV)
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/pthread)
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/iconv)

tests/examples/c/CMakeLists.txt

 PROJECT(TDengine)
 
-IF (TD_WINDOWS_64)
+IF (TD_WINDOWS_64 OR TD_WINDOWS_32)
   INCLUDE_DIRECTORIES(${TD_ROOT_DIR}/deps/pthread)
 ENDIF ()