From aa54dd78fc118f86e2ba549ce06918f0f272cc5d Mon Sep 17 00:00:00 2001 From: hzcheng Date: Tue, 10 Mar 2020 03:44:55 +0000 Subject: [PATCH] make client compile --- src/CMakeLists.txt | 4 ++-- src/client/inc/tscSQLParser.h | 2 +- src/client/src/tscFunctionImpl.c | 2 +- src/client/src/tscLocal.c | 2 +- src/client/src/tscParseInsert.c | 2 +- src/client/src/tscSchemaUtil.c | 2 +- src/kit/shell/src/shellEngine.c | 2 +- src/query/inc/tast.h | 2 +- src/query/inc/tsqlfunction.h | 2 +- src/query/inc/tvariant.h | 2 ++ src/query/src/textbuffer.c | 2 +- src/query/src/tinterpolation.c | 2 +- src/query/src/tpercentile.c | 2 +- src/query/src/tscAst.c | 2 +- src/query/src/tscSQLParserImpl.c | 2 +- src/query/src/tscSyntaxtreefunction.c | 2 +- src/query/src/ttokenizer.c | 2 +- src/query/src/tvariant.c | 4 ++-- src/util/inc/sskiplist.h | 2 +- 19 files changed, 22 insertions(+), 20 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index fb94ef7580..e1fbefaf71 100644 --- a/src/CMakeLists.txt +++ b/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) diff --git a/src/client/inc/tscSQLParser.h b/src/client/inc/tscSQLParser.h index 87c193de75..c7f8ba06e8 100644 --- a/src/client/inc/tscSQLParser.h +++ b/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" diff --git a/src/client/src/tscFunctionImpl.c b/src/client/src/tscFunctionImpl.c index 88b1fc0c28..9c4f7e9c55 100644 --- a/src/client/src/tscFunctionImpl.c +++ b/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" diff --git a/src/client/src/tscLocal.c b/src/client/src/tscLocal.c index ab57719d09..89b43816c8 100644 --- a/src/client/src/tscLocal.c +++ b/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" diff --git a/src/client/src/tscParseInsert.c b/src/client/src/tscParseInsert.c index b54600f641..4c9f99b932 100644 --- a/src/client/src/tscParseInsert.c +++ b/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" diff --git a/src/client/src/tscSchemaUtil.c b/src/client/src/tscSchemaUtil.c index 250e296e53..d412ac18c8 100644 --- a/src/client/src/tscSchemaUtil.c +++ b/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) { diff --git a/src/kit/shell/src/shellEngine.c b/src/kit/shell/src/shellEngine.c index a4a589d55c..61fdb424e5 100644 --- a/src/kit/shell/src/shellEngine.c +++ b/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 diff --git a/src/query/inc/tast.h b/src/query/inc/tast.h index 3cb483a91b..1e89ffb49d 100644 --- a/src/query/inc/tast.h +++ b/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; diff --git a/src/query/inc/tsqlfunction.h b/src/query/inc/tsqlfunction.h index dc5f284efa..27bce71300 100644 --- a/src/query/inc/tsqlfunction.h +++ b/src/query/inc/tsqlfunction.h @@ -24,7 +24,7 @@ extern "C" { #include #include "trpc.h" -#include "ttypes.h" +#include "taosdef.h" #include "tvariant.h" #define TSDB_FUNC_INVALID_ID -1 diff --git a/src/query/inc/tvariant.h b/src/query/inc/tvariant.h index f54a3a4348..7ed5aa8dbe 100644 --- a/src/query/inc/tvariant.h +++ b/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 diff --git a/src/query/src/textbuffer.c b/src/query/src/textbuffer.c index 8ce090d335..056fe80858 100644 --- a/src/query/src/textbuffer.c +++ b/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) \ diff --git a/src/query/src/tinterpolation.c b/src/query/src/tinterpolation.c index cb7c8854ce..1a9da44788 100644 --- a/src/query/src/tinterpolation.c +++ b/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) diff --git a/src/query/src/tpercentile.c b/src/query/src/tpercentile.c index a5c074839c..6e1c28c516 100644 --- a/src/query/src/tpercentile.c +++ b/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) { diff --git a/src/query/src/tscAst.c b/src/query/src/tscAst.c index 70fda9bd93..7be583a5ea 100644 --- a/src/query/src/tscAst.c +++ b/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" diff --git a/src/query/src/tscSQLParserImpl.c b/src/query/src/tscSQLParserImpl.c index 0a76b867f2..e4067d470f 100644 --- a/src/query/src/tscSQLParserImpl.c +++ b/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) { diff --git a/src/query/src/tscSyntaxtreefunction.c b/src/query/src/tscSyntaxtreefunction.c index 3fe43d9c1e..e3c00ed59d 100644 --- a/src/query/src/tscSyntaxtreefunction.c +++ b/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) \ diff --git a/src/query/src/ttokenizer.c b/src/query/src/ttokenizer.c index c53debcb45..f43d344ca3 100644 --- a/src/query/src/ttokenizer.c +++ b/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 diff --git a/src/query/src/tvariant.c b/src/query/src/tvariant.c index 8c8887ca2e..c9168ab252 100644 --- a/src/query/src/tvariant.c +++ b/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 diff --git a/src/util/inc/sskiplist.h b/src/util/inc/sskiplist.h index 2f300fa4ea..f2ae2efc54 100644 --- a/src/util/inc/sskiplist.h +++ b/src/util/inc/sskiplist.h @@ -28,7 +28,7 @@ extern "C" { #include #include "os.h" -#include "ttypes.h" +#include "taosdef.h" /* * key of each node