TD-1090 first version of windows 32 client

src/client/inc/tscUtil.h

@@ -108,7 +108,7 @@ int32_t tscCreateDataBlock(size_t initialSize, int32_t rowSize, int32_t startOff
 void tscDestroyDataBlock(STableDataBlocks* pDataBlock);
 void tscSortRemoveDataBlockDupRows(STableDataBlocks* dataBuf);
 
-SParamInfo* tscAddParamToDataBlock(STableDataBlocks* pDataBlock, char type, uint8_t timePrec, short bytes,
+SParamInfo* tscAddParamToDataBlock(STableDataBlocks* pDataBlock, char type, uint8_t timePrec, int16_t bytes,
                                    uint32_t offset);
 
 void*   tscDestroyBlockArrayList(SArray* pDataBlockList);

src/client/inc/tsclient.h

@@ -234,7 +234,7 @@ typedef struct {
   char *       curSql;       // current sql, resume position of sql after parsing paused
   int8_t       parseFinished;
 
-  short        numOfCols;
+  int16_t      numOfCols;
   uint32_t     allocSize;
   char *       payload;
   int32_t      payloadLen;

src/client/src/tscUtil.c

@@ -404,7 +404,7 @@ void tscDestroyDataBlock(STableDataBlocks* pDataBlock) {
   taosTFree(pDataBlock);
 }
 
-SParamInfo* tscAddParamToDataBlock(STableDataBlocks* pDataBlock, char type, uint8_t timePrec, short bytes,
+SParamInfo* tscAddParamToDataBlock(STableDataBlocks* pDataBlock, char type, uint8_t timePrec, int16_t bytes,
                                    uint32_t offset) {
   uint32_t needed = pDataBlock->numOfParams + 1;
   if (needed > pDataBlock->numOfAllocedParams) {

src/inc/taosdef.h

@@ -63,7 +63,7 @@ typedef struct tstr {
 extern const int32_t TYPE_BYTES[11];
 // TODO: replace and remove code below
 #define CHAR_BYTES   sizeof(char)
-#define SHORT_BYTES  sizeof(short)
+#define SHORT_BYTES  sizeof(int16_t)
 #define INT_BYTES    sizeof(int)
 #define LONG_BYTES   sizeof(int64_t)
 #define FLOAT_BYTES  sizeof(float)

src/inc/taosmsg.h

@@ -424,7 +424,10 @@ typedef struct SColumnInfo {
   int16_t            type;
   int16_t            bytes;
   int16_t            numOfFilters;
+  union{
+    int64_t placeholder;
     SColumnFilterInfo *filters;
+  };
 } SColumnInfo;
 
 typedef struct STableIdInfo {

src/sync/inc/taosTcpPool.h

@@ -26,7 +26,7 @@ typedef void* tthread_h;
 typedef struct {
   int       numOfThreads;
   uint32_t  serverIp;
-  short     port;
+  int16_t   port;
   int       bufferSize;
   void     (*processBrokenLink)(void *ahandle);
   int      (*processIncomingMsg)(void *ahandle, void *buffer);

tests/tsim/inc/sim.h

@@ -96,8 +96,8 @@ enum {
 
 struct _script_t;
 typedef struct _cmd_t {
-  short cmdno;
-  short nlen;
+  int16_t cmdno;
+  int16_t nlen;
   char name[MAX_SIM_CMD_NAME_LEN];
   bool (*parseCmd)(char *, struct _cmd_t *, int);
   bool (*executeCmd)(struct _script_t *script, char *option);
@@ -105,11 +105,11 @@ typedef struct _cmd_t {
 } SCommand;
 
 typedef struct {
-  short cmdno;
-  short jump;        // jump position
-  short errorJump;   // sql jump flag, while '-x' exist in sql cmd, this flag
+  int16_t cmdno;
+  int16_t jump;        // jump position
+  int16_t errorJump;   // sql jump flag, while '-x' exist in sql cmd, this flag
                        // will be SQL_JUMP_TRUE, otherwise is SQL_JUMP_FALSE */
-  short lineNum;     // correspodning line number in original file
+  int16_t lineNum;     // correspodning line number in original file
   int optionOffset;  // relative option offset
 } SCmdLine;
 

tests/tsim/inc/simParse.h

@@ -33,8 +33,7 @@ enum {
 
 /* label stack */
 typedef struct {
-  char top;                                  /* number of labels */
-  short pos[MAX_NUM_LABLES];                 /* the position of the label */
+  int16_t pos[MAX_NUM_LABLES];                 /* the position of the label */
   char    label[MAX_NUM_LABLES][MAX_LABEL_LEN]; /* name of the label */
 } SLabel;
 
@@ -42,10 +41,10 @@ typedef struct {
 typedef struct {
   char     top;                  /* the number of blocks stacked */
   char     type[MAX_NUM_BLOCK];  /* the block type */
-  short *pos[MAX_NUM_BLOCK]; /* position of the jump for if/elif/case */
-  short back[MAX_NUM_BLOCK]; /* go back, endw and continue */
+  int16_t *pos[MAX_NUM_BLOCK]; /* position of the jump for if/elif/case */
+  int16_t  back[MAX_NUM_BLOCK]; /* go back, endw and continue */
   char     numJump[MAX_NUM_BLOCK];
-  short *jump[MAX_NUM_BLOCK][MAX_NUM_JUMP]; /* break or elif */
+  int16_t *jump[MAX_NUM_BLOCK][MAX_NUM_JUMP]; /* break or elif */
   char     sexp[MAX_NUM_BLOCK][40];             /*switch expression */
   char     sexpLen[MAX_NUM_BLOCK];              /*switch expression length */
 } SBlock;