make client compile

src/CMakeLists.txt

@@ -7,8 +7,8 @@ ADD_SUBDIRECTORY(thirdparty)
 
 ADD_SUBDIRECTORY(common)
 ADD_SUBDIRECTORY(util)
-# ADD_SUBDIRECTORY(rpc)
-# ADD_SUBDIRECTORY(client)
+ADD_SUBDIRECTORY(rpc)
+ADD_SUBDIRECTORY(client)
 # ADD_SUBDIRECTORY(kit)
 # ADD_SUBDIRECTORY(plugins)
 # ADD_SUBDIRECTORY(sdb)

src/client/inc/tscSQLParser.h

@@ -23,7 +23,7 @@ extern "C" {
 #include "taos.h"
 #include "taosmsg.h"
 #include "ttokendef.h"
-#include "ttypes.h"
+#include "taosdef.h"
 #include "tvariant.h"
 #include "qsqlparser.h"
 

src/client/src/tscFunctionImpl.c

@@ -25,7 +25,7 @@
 #include "tscompression.h"
 #include "tsqlfunction.h"
 #include "ttime.h"
-#include "ttypes.h"
+#include "taosdef.h"
 #include "tutil.h"
 #include "tpercentile.h"
 

src/client/src/tscLocal.c

@@ -19,7 +19,7 @@
 #include "tcache.h"
 #include "tscUtil.h"
 #include "tsclient.h"
-#include "ttypes.h"
+#include "taosdef.h"
 
 #include "textbuffer.h"
 #include "tscSecondaryMerge.h"

src/client/src/tscParseInsert.c

@@ -25,7 +25,7 @@
 #include "tschemautil.h"
 #include "tsclient.h"
 #include "ttokendef.h"
-#include "ttypes.h"
+#include "taosdef.h"
 
 #include "tlog.h"
 #include "tstoken.h"

src/client/src/tscSchemaUtil.c

@@ -17,7 +17,7 @@
 #include "taosmsg.h"
 #include "tschemautil.h"
 #include "ttokendef.h"
-#include "ttypes.h"
+#include "taosdef.h"
 #include "tutil.h"
 
 bool isValidSchema(struct SSchema* pSchema, int32_t numOfCols) {

src/kit/shell/src/shellEngine.c

@@ -21,7 +21,7 @@
 #include "shellCommand.h"
 #include "ttime.h"
 #include "tutil.h"
-#include "ttypes.h"
+#include "taosdef.h"
 #include "taoserror.h"
 
 #include <regex.h>

src/query/inc/tast.h

@@ -23,7 +23,7 @@ extern "C" {
 #include "os.h"
 
 #include "taosmsg.h"
-#include "ttypes.h"
+#include "taosdef.h"
 #include "tvariant.h"
 
 struct tSQLBinaryExpr;

src/query/inc/tsqlfunction.h

@@ -24,7 +24,7 @@ extern "C" {
 #include <stdint.h>
 
 #include "trpc.h"
-#include "ttypes.h"
+#include "taosdef.h"
 #include "tvariant.h"
 
 #define TSDB_FUNC_INVALID_ID  -1

src/query/inc/tvariant.h

@@ -16,6 +16,8 @@
 #ifndef TDENGINE_TVARIANT_H
 #define TDENGINE_TVARIANT_H
 
+#include "tstoken.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif

src/query/src/textbuffer.c

@@ -19,7 +19,7 @@
 #include "tlog.h"
 #include "tsqlfunction.h"
 #include "ttime.h"
-#include "ttypes.h"
+#include "taosdef.h"
 #include "tutil.h"
 
 #define COLMODEL_GET_VAL(data, schema, allrow, rowId, colId) \

src/query/src/tinterpolation.c

@@ -18,7 +18,7 @@
 #include "textbuffer.h"
 #include "tinterpolation.h"
 #include "tsqlfunction.h"
-#include "ttypes.h"
+#include "taosdef.h"
 
 #define INTERPOL_IS_ASC_INTERPOL(interp) ((interp)->order == TSQL_SO_ASC)
 

src/query/src/tpercentile.c

@@ -18,7 +18,7 @@
 #include "taosmsg.h"
 #include "taosdef.h"
 #include "tlog.h"
-#include "ttypes.h"
+#include "taosdef.h"
 #include "tpercentile.h"
 
 tExtMemBuffer *releaseBucketsExceptFor(tMemBucket *pMemBucket, int16_t segIdx, int16_t slotIdx) {

src/query/src/tscAst.c

@@ -24,7 +24,7 @@
 #include "tsqlfunction.h"
 #include "tstoken.h"
 #include "ttokendef.h"
-#include "ttypes.h"
+#include "taosdef.h"
 #include "tutil.h"
 #include "qsqlparser.h"
 

src/query/src/tscSQLParserImpl.c

@@ -22,7 +22,7 @@
 #include "tstoken.h"
 #include "ttime.h"
 #include "ttokendef.h"
-#include "ttypes.h"
+#include "taosdef.h"
 #include "tutil.h"
 
 int32_t tSQLParse(SSqlInfo *pSQLInfo, const char *pStr) {

src/query/src/tscSyntaxtreefunction.c

@@ -16,7 +16,7 @@
 #include "os.h"
 
 #include "tscSyntaxtreefunction.h"
-#include "ttypes.h"
+#include "taosdef.h"
 #include "tutil.h"
 
 #define ARRAY_LIST_OP(left, right, _left_type, _right_type, len1, len2, out, op, _res_type, _ord)     \

src/query/src/ttokenizer.c

@@ -19,7 +19,7 @@
 #include "shash.h"
 #include "tstoken.h"
 #include "ttokendef.h"
-#include "ttypes.h"
+#include "taosdef.h"
 #include "tutil.h"
 
 // All the keywords of the SQL language are stored in a hash table

src/query/src/tvariant.c

@@ -19,10 +19,10 @@
 #include "shash.h"
 #include "tstoken.h"
 #include "ttokendef.h"
-#include "ttypes.h"
+#include "taosdef.h"
 #include "tutil.h"
 #include "tvariant.h"
-#include "ttypes.h"
+#include "taosdef.h"
 #include "taos.h"
 
 // todo support scientific expression number and oct number

src/util/inc/sskiplist.h

@@ -28,7 +28,7 @@ extern "C" {
 #include <stdlib.h>
 
 #include "os.h"
-#include "ttypes.h"
+#include "taosdef.h"
 
 /*
  * key of each node