Merge branch '2.0' into refact/slguan

# Conflicts:
#	src/client/src/tscServer.c

src/CMakeLists.txt

@@ -11,4 +11,5 @@ ADD_SUBDIRECTORY(sdb)
 ADD_SUBDIRECTORY(mnode)
 ADD_SUBDIRECTORY(vnode)
 ADD_SUBDIRECTORY(dnode)
+ADD_SUBDIRECTORY(query)
 #ADD_SUBDIRECTORY(connector/jdbc)

src/client/CMakeLists.txt

@@ -5,6 +5,7 @@ INCLUDE_DIRECTORIES(inc)
 INCLUDE_DIRECTORIES(jni)
 INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
 INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/util/inc)
+INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/query/inc)
 INCLUDE_DIRECTORIES(${TD_ENTERPRISE_DIR}/src/inc)
 INCLUDE_DIRECTORIES(${TD_OS_DIR}/inc)
 AUX_SOURCE_DIRECTORY(src SRC)
@@ -14,7 +15,7 @@ IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
 
   # set the static lib name
   ADD_LIBRARY(taos_static STATIC ${SRC})
-  TARGET_LINK_LIBRARIES(taos_static trpc tutil pthread m rt)
+  TARGET_LINK_LIBRARIES(taos_static query trpc tutil pthread m rt)
   SET_TARGET_PROPERTIES(taos_static PROPERTIES OUTPUT_NAME "taos_static")
   SET_TARGET_PROPERTIES(taos_static PROPERTIES CLEAN_DIRECT_OUTPUT 1)
 

src/client/inc/tscSQLParser.h

@@ -22,69 +22,10 @@ extern "C" {
 
 #include "taos.h"
 #include "taosmsg.h"
-#include "tsqldef.h"
+#include "ttokendef.h"
 #include "ttypes.h"
-
-enum _sql_cmd {
-  TSDB_SQL_SELECT = 1,
-  TSDB_SQL_FETCH,
-  TSDB_SQL_INSERT,
-  
-  TSDB_SQL_MGMT,  // the SQL below is for mgmt node
-  TSDB_SQL_CREATE_DB,
-  TSDB_SQL_CREATE_TABLE,
-  TSDB_SQL_DROP_DB,
-  TSDB_SQL_DROP_TABLE,
-  TSDB_SQL_CREATE_ACCT,
-  TSDB_SQL_CREATE_USER,  //10
-  TSDB_SQL_DROP_ACCT,
-  TSDB_SQL_DROP_USER,
-  TSDB_SQL_ALTER_USER,
-  TSDB_SQL_ALTER_ACCT,
-  TSDB_SQL_ALTER_TABLE,
-  TSDB_SQL_ALTER_DB,
-  TSDB_SQL_CREATE_MNODE,
-  TSDB_SQL_DROP_MNODE,
-  TSDB_SQL_CREATE_DNODE,
-  TSDB_SQL_DROP_DNODE,  // 20
-  TSDB_SQL_CFG_DNODE,
-  TSDB_SQL_CFG_MNODE,
-  TSDB_SQL_SHOW,
-  TSDB_SQL_RETRIEVE,
-  TSDB_SQL_KILL_QUERY,
-  TSDB_SQL_KILL_STREAM,
-  TSDB_SQL_KILL_CONNECTION,
-  
-  TSDB_SQL_READ,  // SQL below is for read operation
-  TSDB_SQL_CONNECT,
-  TSDB_SQL_USE_DB,    // 30
-  TSDB_SQL_META,
-  TSDB_SQL_METRIC,
-  TSDB_SQL_MULTI_META,
-  TSDB_SQL_HB,
-  
-  TSDB_SQL_LOCAL,  // SQL below for client local
-  TSDB_SQL_DESCRIBE_TABLE,
-  TSDB_SQL_RETRIEVE_METRIC,
-  TSDB_SQL_METRIC_JOIN_RETRIEVE,
-  TSDB_SQL_RETRIEVE_TAGS,
-  
-  /*
-   * build empty result instead of accessing dnode to fetch result
-   * reset the client cache
-   */
-  TSDB_SQL_RETRIEVE_EMPTY_RESULT,  //40
-  
-  TSDB_SQL_RESET_CACHE,
-  TSDB_SQL_SERV_STATUS,
-  TSDB_SQL_CURRENT_DB,
-  TSDB_SQL_SERV_VERSION,
-  TSDB_SQL_CLI_VERSION,
-  TSDB_SQL_CURRENT_USER,
-  TSDB_SQL_CFG_LOCAL,
-  
-  TSDB_SQL_MAX   //48
-};
+#include "tvariant.h"
+#include "qsqlparser.h"
 
 enum {
   TSQL_NODE_TYPE_EXPR = 0x1,
@@ -96,321 +37,6 @@ enum {
 #define NORMAL_ARITHMETIC 1
 #define AGG_ARIGHTMEIC    2
 
-extern char tTokenTypeSwitcher[13];
-
-#define toTSDBType(x)                          \
-  do {                                         \
-    if ((x) >= tListLen(tTokenTypeSwitcher)) { \
-      (x) = TSDB_DATA_TYPE_BINARY;             \
-    } else {                                   \
-      (x) = tTokenTypeSwitcher[(x)];           \
-    }                                          \
-  } while (0)
-
-typedef struct SLimitVal {
-  int64_t limit;
-  int64_t offset;
-} SLimitVal;
-
-typedef struct SOrderVal {
-  uint32_t order;
-  int32_t orderColId;
-} SOrderVal;
-
-typedef struct tVariantListItem {
-  tVariant pVar;
-  uint8_t  sortOrder;
-} tVariantListItem;
-
-typedef struct tVariantList {
-  int32_t           nExpr;  /* Number of expressions on the list */
-  int32_t           nAlloc; /* Number of entries allocated below */
-  tVariantListItem *a;      /* One entry for each expression */
-} tVariantList;
-
-typedef struct tFieldList {
-  int32_t     nField;
-  int32_t     nAlloc;
-  TAOS_FIELD *p;
-} tFieldList;
-
-// create table operation type
-enum TSQL_TYPE {
-  TSQL_CREATE_TABLE = 0x1,
-  TSQL_CREATE_STABLE = 0x2,
-  TSQL_CREATE_TABLE_FROM_STABLE = 0x3,
-  TSQL_CREATE_STREAM = 0x4,
-};
-
-typedef struct SQuerySQL {
-  struct tSQLExprList *pSelection;   // select clause
-  tVariantList *       from;         // from clause
-  struct tSQLExpr *    pWhere;       // where clause [optional]
-  tVariantList *       pGroupby;     // groupby clause, only for tags[optional]
-  tVariantList *       pSortOrder;   // orderby [optional]
-  SSQLToken            interval;     // interval [optional]
-  SSQLToken            sliding;      // sliding window [optional]
-  SLimitVal            limit;        // limit offset [optional]
-  SLimitVal            slimit;       // group limit offset [optional]
-  tVariantList *       fillType;     // fill type[optional]
-  SSQLToken            selectToken;  // sql string
-} SQuerySQL;
-
-typedef struct SCreateTableSQL {
-  struct SSQLToken name;  // meter name, create table [meterName] xxx
-  bool             existCheck;
-  
-  int8_t           type; // create normal table/from super table/ stream
-  struct {
-    tFieldList *pTagColumns;  // for normal table, pTagColumns = NULL;
-    tFieldList *pColumns;
-  } colInfo;
-
-  struct {
-    SSQLToken     stableName;  // super table name, for using clause
-    tVariantList *pTagVals;    // create by using metric, tag value
-    STagData      tagdata;
-  } usingInfo;
-
-  SQuerySQL *pSelect;
-} SCreateTableSQL;
-
-typedef struct SAlterTableSQL {
-  SSQLToken     name;
-  int16_t       type;
-  STagData      tagData;
-  
-  tFieldList *  pAddColumns;
-  tVariantList *varList;  // set t=val or: change src dst
-} SAlterTableSQL;
-
-typedef struct SCreateDBInfo {
-  SSQLToken dbname;
-  int32_t   replica;
-  int32_t   cacheBlockSize;
-  int32_t   tablesPerVnode;
-  int32_t   daysPerFile;
-  int32_t   rowPerFileBlock;
-
-  float   numOfAvgCacheBlocks;
-  int32_t numOfBlocksPerTable;
-
-  int64_t   commitTime;
-  int32_t   commitLog;
-  int32_t   compressionLevel;
-  SSQLToken precision;
-
-  tVariantList *keep;
-} SCreateDBInfo;
-
-typedef struct SCreateAcctSQL {
-  int32_t   maxUsers;
-  int32_t   maxDbs;
-  int32_t   maxTimeSeries;
-  int32_t   maxStreams;
-  int32_t   maxPointsPerSecond;
-  int64_t   maxStorage;
-  int64_t   maxQueryTime;
-  int32_t   maxConnections;
-  SSQLToken stat;
-} SCreateAcctSQL;
-
-typedef struct SShowInfo {
-  uint8_t showType;
-  SSQLToken prefix;
-  SSQLToken pattern;
-} SShowInfo;
-
-typedef struct SUserInfo {
-  SSQLToken user;
-  SSQLToken passwd;
-//  bool      hasPasswd;
-  
-  SSQLToken privilege;
-//  bool      hasPrivilege;
-  
-  int16_t   type;
-} SUserInfo;
-
-typedef struct tDCLSQL {
-  int32_t    nTokens; /* Number of expressions on the list */
-  int32_t    nAlloc;  /* Number of entries allocated below */
-  SSQLToken *a;       /* one entry for element */
-  bool  existsCheck;
-
-  union {
-    SCreateDBInfo  dbOpt;
-    SCreateAcctSQL acctOpt;
-    SShowInfo      showOpt;
-    SSQLToken ip;
-  };
-  
-  SUserInfo user;
-  
-} tDCLSQL;
-
-typedef struct SSubclauseInfo {  // "UNION" multiple select sub-clause
-  SQuerySQL **pClause;
-  int32_t     numOfClause;
-} SSubclauseInfo;
-
-typedef struct SSqlInfo {
-  int32_t type;
-  bool    valid;
-
-  union {
-    SCreateTableSQL *pCreateTableInfo;
-    SAlterTableSQL * pAlterInfo;
-    tDCLSQL *        pDCLInfo;
-  };
-
-  SSubclauseInfo subclauseInfo;
-  char           pzErrMsg[256];
-} SSqlInfo;
-
-typedef struct tSQLExpr {
-  /*
-   * for single operand:
-   * TK_ALL
-   * TK_ID
-   * TK_SUM
-   * TK_AVG
-   * TK_MIN
-   * TK_MAX
-   * TK_FIRST
-   * TK_LAST
-   * TK_BOTTOM
-   * TK_TOP
-   * TK_STDDEV
-   * TK_PERCENTILE
-   *
-   * for binary operand:
-   * TK_LESS
-   * TK_LARGE
-   * TK_EQUAL etc...
-   */
-  uint32_t nSQLOptr;  // TK_FUNCTION: sql function, TK_LE: less than(binary expr)
-
-  // the full sql string of function(col, param), which is actually the raw
-  // field name, since the function name is kept in nSQLOptr already
-  SSQLToken            operand;
-  struct tSQLExprList *pParam;  // function parameters
-
-  SSQLToken colInfo;  // field id
-  tVariant  val;      // value only for string, float, int
-
-  struct tSQLExpr *pLeft;   // left child
-  struct tSQLExpr *pRight;  // right child
-} tSQLExpr;
-
-// used in select clause. select <tSQLExprList> from xxx
-typedef struct tSQLExprItem {
-  tSQLExpr *pNode;      // The list of expressions
-  char *    aliasName;  // alias name, null-terminated string
-} tSQLExprItem;
-
-typedef struct tSQLExprList {
-  int32_t       nExpr;  /* Number of expressions on the list */
-  int32_t       nAlloc; /* Number of entries allocated below */
-  tSQLExprItem *a;      /* One entry for each expression */
-} tSQLExprList;
-
-typedef struct tSQLExprListList {
-  int32_t        nList;  /* Number of expressions on the list */
-  int32_t        nAlloc; /* Number of entries allocated below */
-  tSQLExprList **a;      /* one entry for each row */
-} tSQLExprListList;
-
-#define ParseTOKENTYPE SSQLToken
-
-void *ParseAlloc(void *(*mallocProc)(size_t));
-
-/**
- *
- * @param yyp      The parser
- * @param yymajor  The major token code number
- * @param yyminor  The value for the token
- */
-void Parse(void *yyp, int yymajor, ParseTOKENTYPE yyminor, SSqlInfo *);
-
-/**
- *
- * @param p         The parser to be deleted
- * @param freeProc  Function used to reclaim memory
- */
-void ParseFree(void *p, void (*freeProc)(void *));
-
-tVariantList *tVariantListAppend(tVariantList *pList, tVariant *pVar, uint8_t sortOrder);
-
-tVariantList *tVariantListInsert(tVariantList *pList, tVariant *pVar, uint8_t sortOrder, int32_t index);
-
-tVariantList *tVariantListAppendToken(tVariantList *pList, SSQLToken *pAliasToken, uint8_t sortOrder);
-void          tVariantListDestroy(tVariantList *pList);
-
-tFieldList *tFieldListAppend(tFieldList *pList, TAOS_FIELD *pField);
-
-void tFieldListDestroy(tFieldList *pList);
-
-tSQLExpr *tSQLExprCreate(tSQLExpr *pLeft, tSQLExpr *pRight, int32_t optType);
-
-void tSQLExprDestroy(tSQLExpr *);
-
-tSQLExprList *tSQLExprListAppend(tSQLExprList *pList, tSQLExpr *pNode, SSQLToken *pToken);
-
-void tSQLExprListDestroy(tSQLExprList *pList);
-
-SQuerySQL *tSetQuerySQLElems(SSQLToken *pSelectToken, tSQLExprList *pSelection, tVariantList *pFrom, tSQLExpr *pWhere,
-                             tVariantList *pGroupby, tVariantList *pSortOrder, SSQLToken *pInterval,
-                             SSQLToken *pSliding, tVariantList *pFill, SLimitVal *pLimit, SLimitVal *pGLimit);
-
-SCreateTableSQL *tSetCreateSQLElems(tFieldList *pCols, tFieldList *pTags, SSQLToken *pMetricName,
-                                    tVariantList *pTagVals, SQuerySQL *pSelect, int32_t type);
-
-void      tSQLExprNodeDestroy(tSQLExpr *pExpr);
-tSQLExpr *tSQLExprNodeClone(tSQLExpr *pExpr);
-
-SAlterTableSQL *tAlterTableSQLElems(SSQLToken *pMeterName, tFieldList *pCols, tVariantList *pVals, int32_t type);
-
-tSQLExprListList *tSQLListListAppend(tSQLExprListList *pList, tSQLExprList *pExprList);
-
-void destroyAllSelectClause(SSubclauseInfo *pSql);
-void doDestroyQuerySql(SQuerySQL *pSql);
-
-SSqlInfo *      setSQLInfo(SSqlInfo *pInfo, void *pSqlExprInfo, SSQLToken *pMeterName, int32_t type);
-SSubclauseInfo *setSubclause(SSubclauseInfo *pClause, void *pSqlExprInfo);
-
-SSubclauseInfo *appendSelectClause(SSubclauseInfo *pInfo, void *pSubclause);
-
-void setCreatedMeterName(SSqlInfo *pInfo, SSQLToken *pMeterName, SSQLToken *pIfNotExists);
-
-void SQLInfoDestroy(SSqlInfo *pInfo);
-
-void setDCLSQLElems(SSqlInfo *pInfo, int32_t type, int32_t nParams, ...);
-void setDropDBTableInfo(SSqlInfo *pInfo, int32_t type, SSQLToken* pToken, SSQLToken* existsCheck);
-void setShowOptions(SSqlInfo *pInfo, int32_t type, SSQLToken* prefix, SSQLToken* pPatterns);
-
-tDCLSQL *tTokenListAppend(tDCLSQL *pTokenList, SSQLToken *pToken);
-
-void setCreateDBSQL(SSqlInfo *pInfo, int32_t type, SSQLToken *pToken, SCreateDBInfo *pDB, SSQLToken *pIgExists);
-
-void setCreateAcctSQL(SSqlInfo *pInfo, int32_t type, SSQLToken *pName, SSQLToken *pPwd, SCreateAcctSQL *pAcctInfo);
-void setCreateUserSQL(SSqlInfo *pInfo, SSQLToken *pName, SSQLToken *pPasswd);
-void setKillSQL(SSqlInfo *pInfo, int32_t type, SSQLToken *ip);
-void setAlterUserSQL(SSqlInfo *pInfo, int16_t type, SSQLToken *pName, SSQLToken* pPwd, SSQLToken *pPrivilege);
-
-void setDefaultCreateDbOption(SCreateDBInfo *pDBInfo);
-
-// prefix show db.tables;
-void setDBName(SSQLToken *pCpxName, SSQLToken *pDB);
-
-tSQLExpr *tSQLExprIdValueCreate(SSQLToken *pToken, int32_t optType);
-
-tSQLExpr *tSQLExprCreateFunction(tSQLExprList *pList, SSQLToken *pFuncToken, SSQLToken *endToken, int32_t optType);
-
-void tSQLSetColumnInfo(TAOS_FIELD *pField, SSQLToken *pName, TAOS_FIELD *pType);
-
-void tSQLSetColumnType(TAOS_FIELD *pField, SSQLToken *pToken);
-
 int32_t tSQLParse(SSqlInfo *pSQLInfo, const char *pSql);
 
 #ifdef __cplusplus

src/client/inc/tsclient.h

@@ -31,6 +31,7 @@ extern "C" {
 #include "tsqlfunction.h"
 #include "tutil.h"
 #include "trpc.h"
+#include "qsqltype.h"
 
 #define TSC_GET_RESPTR_BASE(res, _queryinfo, col) (res->data + ((_queryinfo)->fieldsInfo.pSqlExpr[col]->offset) * res->numOfRows)
 
@@ -428,6 +429,8 @@ void tscFreeSqlObj(SSqlObj *pObj);
 
 void tscCloseTscObj(STscObj *pObj);
 
+void doAsyncQuery(STscObj* pObj, SSqlObj* pSql, void (*fp)(), void* param, const char* sqlstr, int32_t sqlLen);
+
 void tscProcessMultiVnodesInsert(SSqlObj *pSql);
 void tscProcessMultiVnodesInsertFromFile(SSqlObj *pSql);
 void tscKillMetricQuery(SSqlObj *pSql);
@@ -447,7 +450,7 @@ void tscQueueAsyncFreeResult(SSqlObj *pSql);
 extern void *     pVnodeConn;
 extern void *     pTscMgmtConn;
 extern void *     tscCacheHandle;
-extern uint8_t    globalCode;
+extern int32_t    globalCode;
 extern int        slaveIndex;
 extern void *     tscTmr;
 extern void *     tscConnCache;

src/client/src/tscAsync.c

@@ -40,47 +40,22 @@ static void tscProcessAsyncRetrieveImpl(void *param, TAOS_RES *tres, int numOfRo
 static void tscAsyncFetchRowsProxy(void *param, TAOS_RES *tres, int numOfRows);
 static void tscAsyncFetchSingleRowProxy(void *param, TAOS_RES *tres, int numOfRows);
 
-// TODO return the correct error code to client in tscQueueAsyncError
-void taos_query_a(TAOS *taos, const char *sqlstr, void (*fp)(void *, TAOS_RES *, int), void *param) {
-  STscObj *pObj = (STscObj *)taos;
-  if (pObj == NULL || pObj->signature != pObj) {
-    tscError("bug!!! pObj:%p", pObj);
-    globalCode = TSDB_CODE_DISCONNECTED;
-    tscQueueAsyncError(fp, param);
-    return;
-  }
-
-  int32_t sqlLen = strlen(sqlstr);
-  if (sqlLen > tsMaxSQLStringLen) {
-    tscError("sql string too long");
-    tscQueueAsyncError(fp, param);
-    return;
-  }
-
-  taosNotePrintTsc(sqlstr);
-
-  SSqlObj *pSql = (SSqlObj *)calloc(1, sizeof(SSqlObj));
-  if (pSql == NULL) {
-    tscError("failed to malloc sqlObj");
-    tscQueueAsyncError(fp, param);
-    return;
-  }
-
+void doAsyncQuery(STscObj* pObj, SSqlObj* pSql, void (*fp)(), void* param, const char* sqlstr, int32_t sqlLen) {
   SSqlCmd *pCmd = &pSql->cmd;
   SSqlRes *pRes = &pSql->res;
-
+  
   pSql->signature = pSql;
   pSql->pTscObj = pObj;
   pSql->fp = fp;
   pSql->param = param;
-
+  
   if (TSDB_CODE_SUCCESS != tscAllocPayload(pCmd, TSDB_DEFAULT_PAYLOAD_SIZE)) {
     tscError("failed to malloc payload");
     tfree(pSql);
     tscQueueAsyncError(fp, param);
     return;
   }
-
+  
   pSql->sqlstr = malloc(sqlLen + 1);
   if (pSql->sqlstr == NULL) {
     tscError("%p failed to malloc sql string buffer", pSql);
@@ -89,25 +64,54 @@ void taos_query_a(TAOS *taos, const char *sqlstr, void (*fp)(void *, TAOS_RES *,
     free(pSql);
     return;
   }
-
+  
   pRes->qhandle = 0;
   pRes->numOfRows = 1;
-
+  
   strtolower(pSql->sqlstr, sqlstr);
   tscDump("%p pObj:%p, Async SQL: %s", pSql, pObj, pSql->sqlstr);
-
+  
   int32_t code = tsParseSql(pSql, true);
   if (code == TSDB_CODE_ACTION_IN_PROGRESS) return;
-
+  
   if (code != TSDB_CODE_SUCCESS) {
     pSql->res.code = (uint8_t)code;
     tscQueueAsyncRes(pSql);
     return;
   }
-
+  
   tscDoQuery(pSql);
 }
 
+// TODO return the correct error code to client in tscQueueAsyncError
+void taos_query_a(TAOS *taos, const char *sqlstr, void (*fp)(void *, TAOS_RES *, int), void *param) {
+  STscObj *pObj = (STscObj *)taos;
+  if (pObj == NULL || pObj->signature != pObj) {
+    tscError("bug!!! pObj:%p", pObj);
+    globalCode = TSDB_CODE_DISCONNECTED;
+    tscQueueAsyncError(fp, param);
+    return;
+  }
+  
+  int32_t sqlLen = strlen(sqlstr);
+  if (sqlLen > tsMaxSQLStringLen) {
+    tscError("sql string too long");
+    tscQueueAsyncError(fp, param);
+    return;
+  }
+  
+  taosNotePrintTsc(sqlstr);
+  
+  SSqlObj *pSql = (SSqlObj *)calloc(1, sizeof(SSqlObj));
+  if (pSql == NULL) {
+    tscError("failed to malloc sqlObj");
+    tscQueueAsyncError(fp, param);
+    return;
+  }
+  
+  doAsyncQuery(pObj, pSql, fp, param, sqlstr, sqlLen);
+}
+
 static void tscAsyncFetchRowsProxy(void *param, TAOS_RES *tres, int numOfRows) {
   if (tres == NULL) {
     return;

src/client/src/tscParseInsert.c

@@ -18,13 +18,13 @@
 
 #define _XOPEN_SOURCE
 
-#include "os.h"
 #include "hash.h"
+#include "os.h"
 #include "tscSecondaryMerge.h"
 #include "tscUtil.h"
 #include "tschemautil.h"
 #include "tsclient.h"
-#include "tsqldef.h"
+#include "ttokendef.h"
 #include "ttypes.h"
 
 #include "tlog.h"

src/client/src/tscSchemaUtil.c

@@ -16,7 +16,7 @@
 #include "os.h"
 #include "taosmsg.h"
 #include "tschemautil.h"
-#include "tsqldef.h"
+#include "ttokendef.h"
 #include "ttypes.h"
 #include "tutil.h"
 

src/client/src/tscServer.c

@@ -182,6 +182,8 @@ int tscSendMsgToServer(SSqlObj *pSql) {
   }
 
   pSql->ipList->ip[0] = inet_addr("192.168.0.1");
+  SSqlCmd* pCmd = &pSql->cmd;
+  
   if (pSql->cmd.command < TSDB_SQL_MGMT) {
     pSql->ipList->port = tsVnodeShellPort;
     tscPrint("%p msg:%s is sent to server %d", pSql, taosMsg[pSql->cmd.msgType], pSql->ipList->port);

src/client/src/tscSql.c

@@ -238,39 +238,36 @@ int taos_query_imp(STscObj *pObj, SSqlObj *pSql) {
   return pRes->code;
 }
 
+static void syncQueryCallback(void *param, TAOS_RES *tres, int code) {
+  STscObj *pObj = (STscObj *)param;
+  assert(pObj != NULL && pObj->pSql != NULL);
+  
+  sem_post(&pObj->pSql->rspSem);
+}
+
 int taos_query(TAOS *taos, const char *sqlstr) {
   STscObj *pObj = (STscObj *)taos;
   if (pObj == NULL || pObj->signature != pObj) {
     globalCode = TSDB_CODE_DISCONNECTED;
     return TSDB_CODE_DISCONNECTED;
   }
-
-  SSqlObj *pSql = pObj->pSql;
-  SSqlRes *pRes = &pSql->res;
-
-  size_t sqlLen = strlen(sqlstr);
-  if (sqlLen > tsMaxSQLStringLen) {
-    pRes->code =
-        tscInvalidSQLErrMsg(pSql->cmd.payload, "sql too long", NULL);  // set the additional error msg for invalid sql
-    tscError("%p SQL result:%d, %s pObj:%p", pSql, pRes->code, taos_errstr(taos), pObj);
-
-    return pRes->code;
-  }
-
-  taosNotePrintTsc(sqlstr);
-
-  void *sql = realloc(pSql->sqlstr, sqlLen + 1);
-  if (sql == NULL) {
-    pRes->code = TSDB_CODE_CLI_OUT_OF_MEMORY;
-    tscError("%p failed to malloc sql string buffer, reason:%s", pSql, strerror(errno));
-
-    tscError("%p SQL result:%d, %s pObj:%p", pSql, pRes->code, taos_errstr(taos), pObj);
-    return pRes->code;
+  
+  SSqlObj *pSql = (SSqlObj *)calloc(1, sizeof(SSqlObj));
+  if (pSql == NULL) {
+    tscError("failed to malloc sqlObj");
+    return TSDB_CODE_CLI_OUT_OF_MEMORY;
   }
+  
+  pObj->pSql = pSql;
+  tsem_init(&pSql->rspSem, 0, 0);
+  
+  int32_t sqlLen = strlen(sqlstr);
+  doAsyncQuery(pObj, pObj->pSql, syncQueryCallback, taos, sqlstr, sqlLen);
 
-  pSql->sqlstr = sql;
-  strtolower(pSql->sqlstr, sqlstr);
-  return taos_query_imp(pObj, pSql);
+  // wait for the callback function to post the semaphore
+  sem_wait(&pSql->rspSem);
+  
+  return pSql->res.code;
 }
 
 TAOS_RES *taos_use_result(TAOS *taos) {
@@ -683,33 +680,37 @@ TAOS_ROW taos_fetch_row_impl(TAOS_RES *res) {
   return doSetResultRowData(pSql);
 }
 
+static void asyncFetchCallback(void *param, TAOS_RES *tres, int numOfRows) {
+  SSqlObj* pSql = (SSqlObj*) tres;
+  if (numOfRows < 0) {
+    // set the error code
+    pSql->res.code = -numOfRows;
+  }
+  
+  sem_post(&pSql->rspSem);
+}
+
 TAOS_ROW taos_fetch_row(TAOS_RES *res) {
   SSqlObj *pSql = (SSqlObj *)res;
-  SSqlCmd *pCmd = &pSql->cmd;
-
   if (pSql == NULL || pSql->signature != pSql) {
     globalCode = TSDB_CODE_DISCONNECTED;
     return NULL;
   }
-
-  /*
-   * projection query on super table, access each virtual node sequentially retrieve data from vnode list,
-   * instead of two-stage merge
-   */
-  TAOS_ROW rows = taos_fetch_row_impl(res);
-  if (rows != NULL) {
-    return rows;
+  
+  SSqlCmd *pCmd = &pSql->cmd;
+  SSqlRes *pRes = &pSql->res;
+  
+  if (pRes->qhandle == 0 || pCmd->command == TSDB_SQL_RETRIEVE_EMPTY_RESULT || pCmd->command == TSDB_SQL_INSERT) {
+    return NULL;
   }
-
-  // current subclause is completed, try the next subclause
-  while (rows == NULL && pCmd->clauseIndex < pCmd->numOfClause - 1) {
-    tscTryQueryNextClause(pSql, NULL);
-
-    // if the rows is not NULL, return immediately
-    rows = taos_fetch_row_impl(res);
+  
+  // current data are exhausted, fetch more data
+  if (pRes->data == NULL || (pRes->data != NULL && pRes->row >= pRes->numOfRows && pCmd->command == TSDB_SQL_RETRIEVE)) {
+    taos_fetch_rows_a(res, asyncFetchCallback, pSql->pTscObj);
+    sem_wait(&pSql->rspSem);
   }
-
-  return rows;
+  
+  return doSetResultRowData(pSql);
 }
 
 int taos_fetch_block(TAOS_RES *res, TAOS_ROW *rows) {
@@ -782,7 +783,13 @@ void taos_free_result_imp(TAOS_RES *res, int keepCmd) {
     /* Query rsp is not received from vnode, so the qhandle is NULL */
     tscTrace("%p qhandle is null, abort free, fp:%p", pSql, pSql->fp);
     if (pSql->fp != NULL) {
-      tscFreeSqlObj(pSql);
+      STscObj* pObj = pSql->pTscObj;
+  
+      if (pSql == pObj->pSql) {
+        pObj->pSql = NULL;
+        tscFreeSqlObj(pSql);
+      }
+      
       tscTrace("%p Async SqlObj is freed by app", pSql);
     } else if (keepCmd) {
       tscFreeSqlResult(pSql);
@@ -849,6 +856,11 @@ void taos_free_result_imp(TAOS_RES *res, int keepCmd) {
         tscFreeSqlObjPartial(pSql);
         tscTrace("%p sql result is freed by app", pSql);
       }
+    } else {  // for async release, remove its link
+      STscObj* pObj = pSql->pTscObj;
+      if (pObj->pSql == pSql) {
+        pObj->pSql = NULL;
+      }
     }
   } else {
     // if no free resource msg is sent to vnode, we free this object immediately.

src/client/src/tscSystem.c

@@ -33,7 +33,7 @@ void *  pVMeterConn;
 void *  pTscMgmtConn;
 void *  pSlaveConn;
 void *  tscCacheHandle;
-uint8_t globalCode = 0;
+int32_t globalCode = 0;
 int     initialized = 0;
 int     slaveIndex;
 void *  tscTmr;

src/client/src/tscUtil.c

@@ -13,10 +13,11 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "os.h"
 #include "tscUtil.h"
 #include "hash.h"
+#include "os.h"
 #include "taosmsg.h"
+#include "tast.h"
 #include "tcache.h"
 #include "tkey.h"
 #include "tmd5.h"
@@ -25,9 +26,8 @@
 #include "tscSecondaryMerge.h"
 #include "tschemautil.h"
 #include "tsclient.h"
-#include "tsqldef.h"
 #include "ttimer.h"
-#include "tast.h"
+#include "ttokendef.h"
 
 /*
  * the detailed information regarding metric meta key is:
@@ -460,11 +460,16 @@ void tscFreeSqlObjPartial(SSqlObj* pSql) {
   pthread_mutex_lock(&pObj->mutex);
   tfree(pSql->sqlstr);
   pthread_mutex_unlock(&pObj->mutex);
-
+  
   tscFreeSqlResult(pSql);
   tfree(pSql->pSubs);
   pSql->numOfSubs = 0;
-
+  
+  pSql->freed = 0;
+  tscFreeSqlCmdData(pCmd);
+  
+  tscTrace("%p free sqlObj partial completed", pSql);
+  
   tscFreeSqlCmdData(pCmd);
 }
 

src/dnode/CMakeLists.txt

@@ -5,6 +5,7 @@ IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
   INCLUDE_DIRECTORIES(${TD_OS_DIR}/inc)
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/util/inc)
+  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/query/inc)
   INCLUDE_DIRECTORIES(${TD_ENTERPRISE_DIR}/src/inc)
   INCLUDE_DIRECTORIES(inc)
   AUX_SOURCE_DIRECTORY(src SRC)

src/inc/taosdef.h

@@ -196,20 +196,6 @@ extern "C" {
 #define TSDB_MAX_NCHAR_LEN             (TSDB_MAX_BYTES_PER_ROW-TSDB_KEYSIZE)
 #define PRIMARYKEY_TIMESTAMP_COL_INDEX  0
 
-#define TSDB_DATA_BOOL_NULL             0x02
-#define TSDB_DATA_TINYINT_NULL          0x80
-#define TSDB_DATA_SMALLINT_NULL         0x8000
-#define TSDB_DATA_INT_NULL              0x80000000
-#define TSDB_DATA_BIGINT_NULL           0x8000000000000000L
-
-#define TSDB_DATA_FLOAT_NULL            0x7FF00000              // it is an NAN
-#define TSDB_DATA_DOUBLE_NULL           0x7FFFFF0000000000L     // an NAN
-#define TSDB_DATA_NCHAR_NULL            0xFFFFFFFF
-#define TSDB_DATA_BINARY_NULL           0xFF
-
-#define TSDB_DATA_NULL_STR              "NULL"
-#define TSDB_DATA_NULL_STR_L            "null"
-
 #define TSDB_MAX_RPC_THREADS            5
 
 #define TSDB_QUERY_TYPE_NON_TYPE                       0x00U     // none type

src/kit/shell/CMakeLists.txt

@@ -4,6 +4,7 @@ PROJECT(TDengine)
 INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
 INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/util/inc)
 INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/client/inc)
+INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/query/inc)
 INCLUDE_DIRECTORIES(${TD_OS_DIR}/inc)
 INCLUDE_DIRECTORIES(inc)
 

src/kit/shell/src/shellEngine.c

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

src/kit/taosdump/CMakeLists.txt

@@ -4,6 +4,7 @@ PROJECT(TDengine)
 INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
 INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/client/inc)
 INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/util/inc)
+INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/query/inc)
 INCLUDE_DIRECTORIES(${TD_OS_DIR}/inc)
 INCLUDE_DIRECTORIES(inc)
 

src/mnode/CMakeLists.txt

@@ -5,6 +5,7 @@ IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
   INCLUDE_DIRECTORIES(${TD_OS_DIR}/inc)
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/util/inc)
+  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/query/inc)
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/dnode/inc)
 
   INCLUDE_DIRECTORIES(inc)

src/mnode/src/mgmtChildTable.c

@@ -16,12 +16,9 @@
 #define _DEFAULT_SOURCE
 #include "os.h"
 #include "taosmsg.h"
-#include "tast.h"
-#include "textbuffer.h"
 #include "tschemautil.h"
 #include "tscompression.h"
 #include "tskiplist.h"
-#include "tsqlfunction.h"
 #include "ttime.h"
 #include "tstatus.h"
 #include "tutil.h"

src/mnode/src/mgmtNormalTable.c

@@ -16,12 +16,8 @@
 #define _DEFAULT_SOURCE
 #include "os.h"
 #include "taosmsg.h"
-#include "tast.h"
-#include "textbuffer.h"
-#include "tschemautil.h"
 #include "tscompression.h"
 #include "tskiplist.h"
-#include "tsqlfunction.h"
 #include "ttime.h"
 #include "tstatus.h"
 #include "tutil.h"

src/mnode/src/mgmtSuperTable.c

@@ -16,8 +16,6 @@
 #define _DEFAULT_SOURCE
 #include "os.h"
 #include "taosmsg.h"
-#include "tast.h"
-#include "textbuffer.h"
 #include "tschemautil.h"
 #include "tscompression.h"
 #include "tskiplist.h"

src/plugins/http/CMakeLists.txt

@@ -5,6 +5,7 @@ IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/client/inc)
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/util/inc)
+  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/query/inc)
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/deps/zlib-1.2.11/inc)
   INCLUDE_DIRECTORIES(${TD_OS_DIR}/inc)
   INCLUDE_DIRECTORIES(inc)

src/plugins/monitor/CMakeLists.txt

@@ -5,6 +5,7 @@ IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/client/inc)
   INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/util/inc)
+  INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/query/inc)
   INCLUDE_DIRECTORIES(${TD_OS_DIR}/inc)
   INCLUDE_DIRECTORIES(inc)
   AUX_SOURCE_DIRECTORY(./src SRC)

src/plugins/monitor/src/monitorSystem.c

@@ -13,11 +13,9 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "os.h"
+
 #include "monitor.h"
-#include <inttypes.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include "dnode.h"
 #include "monitorSystem.h"
 #include "tsclient.h"

src/query/CMakeLists.txt

+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+PROJECT(TDengine)
+
+INCLUDE_DIRECTORIES(${TD_OS_DIR}/inc)
+INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/inc)
+INCLUDE_DIRECTORIES(${TD_COMMUNITY_DIR}/src/util/inc)
+INCLUDE_DIRECTORIES(inc)
+
+IF ((TD_LINUX_64) OR (TD_LINUX_32 AND TD_ARM))
+  AUX_SOURCE_DIRECTORY(src SRC)
+  ADD_LIBRARY(query ${SRC})
+  TARGET_LINK_LIBRARIES(query util m rt)
+ENDIF ()
\ No newline at end of file

src/query/inc/qsqlparser.h

+/*
+ * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
+ *
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef TDENGINE_QASTDEF_H
+#define TDENGINE_QASTDEF_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "taos.h"
+#include "taosmsg.h"
+#include "tstoken.h"
+#include "tvariant.h"
+
+#define ParseTOKENTYPE SSQLToken
+extern char tTokenTypeSwitcher[13];
+
+#define toTSDBType(x)                          \
+  do {                                         \
+    if ((x) >= tListLen(tTokenTypeSwitcher)) { \
+      (x) = TSDB_DATA_TYPE_BINARY;             \
+    } else {                                   \
+      (x) = tTokenTypeSwitcher[(x)];           \
+    }                                          \
+  } while (0)
+  
+typedef struct tFieldList {
+  int32_t     nField;
+  int32_t     nAlloc;
+  TAOS_FIELD *p;
+} tFieldList;
+
+typedef struct SLimitVal {
+  int64_t limit;
+  int64_t offset;
+} SLimitVal;
+
+typedef struct SOrderVal {
+  uint32_t order;
+  int32_t orderColId;
+} SOrderVal;
+
+typedef struct tVariantListItem {
+  tVariant pVar;
+  uint8_t  sortOrder;
+} tVariantListItem;
+
+typedef struct tVariantList {
+  int32_t           nExpr;  /* Number of expressions on the list */
+  int32_t           nAlloc; /* Number of entries allocated below */
+  tVariantListItem *a;      /* One entry for each expression */
+} tVariantList;
+
+typedef struct SQuerySQL {
+  struct tSQLExprList *pSelection;   // select clause
+  tVariantList *       from;         // from clause
+  struct tSQLExpr *    pWhere;       // where clause [optional]
+  tVariantList *       pGroupby;     // groupby clause, only for tags[optional]
+  tVariantList *       pSortOrder;   // orderby [optional]
+  SSQLToken            interval;     // interval [optional]
+  SSQLToken            sliding;      // sliding window [optional]
+  SLimitVal            limit;        // limit offset [optional]
+  SLimitVal            slimit;       // group limit offset [optional]
+  tVariantList *       fillType;     // fill type[optional]
+  SSQLToken            selectToken;  // sql string
+} SQuerySQL;
+
+typedef struct SCreateTableSQL {
+  struct SSQLToken name;  // meter name, create table [meterName] xxx
+  bool             existCheck;
+  
+  int8_t           type; // create normal table/from super table/ stream
+  struct {
+    tFieldList *pTagColumns;  // for normal table, pTagColumns = NULL;
+    tFieldList *pColumns;
+  } colInfo;
+  
+  struct {
+    SSQLToken     stableName;  // super table name, for using clause
+    tVariantList *pTagVals;    // create by using metric, tag value
+    STagData      tagdata;
+  } usingInfo;
+  
+  SQuerySQL *pSelect;
+} SCreateTableSQL;
+
+typedef struct SAlterTableSQL {
+  SSQLToken     name;
+  int16_t       type;
+  STagData      tagData;
+  
+  tFieldList *  pAddColumns;
+  tVariantList *varList;  // set t=val or: change src dst
+} SAlterTableSQL;
+
+typedef struct SCreateDBInfo {
+  SSQLToken dbname;
+  int32_t   replica;
+  int32_t   cacheBlockSize;
+  int32_t   tablesPerVnode;
+  int32_t   daysPerFile;
+  int32_t   rowPerFileBlock;
+  
+  float   numOfAvgCacheBlocks;
+  int32_t numOfBlocksPerTable;
+  
+  int64_t   commitTime;
+  int32_t   commitLog;
+  int32_t   compressionLevel;
+  SSQLToken precision;
+  
+  tVariantList *keep;
+} SCreateDBInfo;
+
+typedef struct SCreateAcctSQL {
+  int32_t   maxUsers;
+  int32_t   maxDbs;
+  int32_t   maxTimeSeries;
+  int32_t   maxStreams;
+  int32_t   maxPointsPerSecond;
+  int64_t   maxStorage;
+  int64_t   maxQueryTime;
+  int32_t   maxConnections;
+  SSQLToken stat;
+} SCreateAcctSQL;
+
+typedef struct SShowInfo {
+  uint8_t showType;
+  SSQLToken prefix;
+  SSQLToken pattern;
+} SShowInfo;
+
+typedef struct SUserInfo {
+  SSQLToken user;
+  SSQLToken passwd;
+  SSQLToken privilege;
+  int16_t   type;
+} SUserInfo;
+
+typedef struct tDCLSQL {
+  int32_t    nTokens; /* Number of expressions on the list */
+  int32_t    nAlloc;  /* Number of entries allocated below */
+  SSQLToken *a;       /* one entry for element */
+  bool  existsCheck;
+  
+  union {
+    SCreateDBInfo  dbOpt;
+    SCreateAcctSQL acctOpt;
+    SShowInfo      showOpt;
+    SSQLToken ip;
+  };
+  
+  SUserInfo user;
+  
+} tDCLSQL;
+
+typedef struct SSubclauseInfo {  // "UNION" multiple select sub-clause
+  SQuerySQL **pClause;
+  int32_t     numOfClause;
+} SSubclauseInfo;
+
+typedef struct SSqlInfo {
+  int32_t type;
+  bool    valid;
+  
+  union {
+    SCreateTableSQL *pCreateTableInfo;
+    SAlterTableSQL * pAlterInfo;
+    tDCLSQL *        pDCLInfo;
+  };
+  
+  SSubclauseInfo subclauseInfo;
+  char           pzErrMsg[256];
+} SSqlInfo;
+
+typedef struct tSQLExpr {
+  /*
+   * for single operand:
+   * TK_ALL
+   * TK_ID
+   * TK_SUM
+   * TK_AVG
+   * TK_MIN
+   * TK_MAX
+   * TK_FIRST
+   * TK_LAST
+   * TK_BOTTOM
+   * TK_TOP
+   * TK_STDDEV
+   * TK_PERCENTILE
+   *
+   * for binary operand:
+   * TK_LESS
+   * TK_LARGE
+   * TK_EQUAL etc...
+   */
+  uint32_t nSQLOptr;  // TK_FUNCTION: sql function, TK_LE: less than(binary expr)
+  
+  // the full sql string of function(col, param), which is actually the raw
+  // field name, since the function name is kept in nSQLOptr already
+  SSQLToken            operand;
+  struct tSQLExprList *pParam;  // function parameters
+  
+  SSQLToken colInfo;  // field id
+  tVariant  val;      // value only for string, float, int
+  
+  struct tSQLExpr *pLeft;   // left child
+  struct tSQLExpr *pRight;  // right child
+} tSQLExpr;
+
+// used in select clause. select <tSQLExprList> from xxx
+typedef struct tSQLExprItem {
+  tSQLExpr *pNode;      // The list of expressions
+  char *    aliasName;  // alias name, null-terminated string
+} tSQLExprItem;
+
+typedef struct tSQLExprList {
+  int32_t       nExpr;  /* Number of expressions on the list */
+  int32_t       nAlloc; /* Number of entries allocated below */
+  tSQLExprItem *a;      /* One entry for each expression */
+} tSQLExprList;
+
+typedef struct tSQLExprListList {
+  int32_t        nList;  /* Number of expressions on the list */
+  int32_t        nAlloc; /* Number of entries allocated below */
+  tSQLExprList **a;      /* one entry for each row */
+} tSQLExprListList;
+
+
+/**
+ *
+ * @param yyp      The parser
+ * @param yymajor  The major token code number
+ * @param yyminor  The value for the token
+ */
+void Parse(void *yyp, int yymajor, ParseTOKENTYPE yyminor, SSqlInfo *);
+
+/**
+ *
+ * @param p         The parser to be deleted
+ * @param freeProc  Function used to reclaim memory
+ */
+void ParseFree(void *p, void (*freeProc)(void *));
+
+tVariantList *tVariantListAppend(tVariantList *pList, tVariant *pVar, uint8_t sortOrder);
+
+tVariantList *tVariantListInsert(tVariantList *pList, tVariant *pVar, uint8_t sortOrder, int32_t index);
+
+tVariantList *tVariantListAppendToken(tVariantList *pList, SSQLToken *pAliasToken, uint8_t sortOrder);
+void          tVariantListDestroy(tVariantList *pList);
+
+tFieldList *tFieldListAppend(tFieldList *pList, TAOS_FIELD *pField);
+
+void tFieldListDestroy(tFieldList *pList);
+
+tSQLExpr *tSQLExprCreate(tSQLExpr *pLeft, tSQLExpr *pRight, int32_t optType);
+
+void tSQLExprDestroy(tSQLExpr *);
+
+tSQLExprList *tSQLExprListAppend(tSQLExprList *pList, tSQLExpr *pNode, SSQLToken *pToken);
+
+void tSQLExprListDestroy(tSQLExprList *pList);
+
+SQuerySQL *tSetQuerySQLElems(SSQLToken *pSelectToken, tSQLExprList *pSelection, tVariantList *pFrom, tSQLExpr *pWhere,
+                             tVariantList *pGroupby, tVariantList *pSortOrder, SSQLToken *pInterval,
+                             SSQLToken *pSliding, tVariantList *pFill, SLimitVal *pLimit, SLimitVal *pGLimit);
+
+SCreateTableSQL *tSetCreateSQLElems(tFieldList *pCols, tFieldList *pTags, SSQLToken *pMetricName,
+                                    tVariantList *pTagVals, SQuerySQL *pSelect, int32_t type);
+
+void      tSQLExprNodeDestroy(tSQLExpr *pExpr);
+tSQLExpr *tSQLExprNodeClone(tSQLExpr *pExpr);
+
+SAlterTableSQL *tAlterTableSQLElems(SSQLToken *pMeterName, tFieldList *pCols, tVariantList *pVals, int32_t type);
+
+tSQLExprListList *tSQLListListAppend(tSQLExprListList *pList, tSQLExprList *pExprList);
+
+void destroyAllSelectClause(SSubclauseInfo *pSql);
+void doDestroyQuerySql(SQuerySQL *pSql);
+
+SSqlInfo *      setSQLInfo(SSqlInfo *pInfo, void *pSqlExprInfo, SSQLToken *pMeterName, int32_t type);
+SSubclauseInfo *setSubclause(SSubclauseInfo *pClause, void *pSqlExprInfo);
+
+SSubclauseInfo *appendSelectClause(SSubclauseInfo *pInfo, void *pSubclause);
+
+void setCreatedMeterName(SSqlInfo *pInfo, SSQLToken *pMeterName, SSQLToken *pIfNotExists);
+
+void SQLInfoDestroy(SSqlInfo *pInfo);
+
+void setDCLSQLElems(SSqlInfo *pInfo, int32_t type, int32_t nParams, ...);
+void setDropDBTableInfo(SSqlInfo *pInfo, int32_t type, SSQLToken* pToken, SSQLToken* existsCheck);
+void setShowOptions(SSqlInfo *pInfo, int32_t type, SSQLToken* prefix, SSQLToken* pPatterns);
+
+tDCLSQL *tTokenListAppend(tDCLSQL *pTokenList, SSQLToken *pToken);
+
+void setCreateDBSQL(SSqlInfo *pInfo, int32_t type, SSQLToken *pToken, SCreateDBInfo *pDB, SSQLToken *pIgExists);
+
+void setCreateAcctSQL(SSqlInfo *pInfo, int32_t type, SSQLToken *pName, SSQLToken *pPwd, SCreateAcctSQL *pAcctInfo);
+void setCreateUserSQL(SSqlInfo *pInfo, SSQLToken *pName, SSQLToken *pPasswd);
+void setKillSQL(SSqlInfo *pInfo, int32_t type, SSQLToken *ip);
+void setAlterUserSQL(SSqlInfo *pInfo, int16_t type, SSQLToken *pName, SSQLToken* pPwd, SSQLToken *pPrivilege);
+
+void setDefaultCreateDbOption(SCreateDBInfo *pDBInfo);
+
+// prefix show db.tables;
+void setDBName(SSQLToken *pCpxName, SSQLToken *pDB);
+
+tSQLExpr *tSQLExprIdValueCreate(SSQLToken *pToken, int32_t optType);
+
+tSQLExpr *tSQLExprCreateFunction(tSQLExprList *pList, SSQLToken *pFuncToken, SSQLToken *endToken, int32_t optType);
+
+void tSQLSetColumnInfo(TAOS_FIELD *pField, SSQLToken *pName, TAOS_FIELD *pType);
+
+void tSQLSetColumnType(TAOS_FIELD *pField, SSQLToken *pToken);
+
+
+void *ParseAlloc(void *(*mallocProc)(size_t));
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // TDENGINE_QASTDEF_H

src/query/inc/qsqltype.h

+/*
+ * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
+ *
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef TDENGINE_QSQLCMD_H
+#define TDENGINE_QSQLCMD_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+enum _sql_type {
+  TSDB_SQL_SELECT = 1,
+  TSDB_SQL_FETCH,
+  TSDB_SQL_INSERT,
+
+  TSDB_SQL_MGMT,  // the SQL below is for mgmt node
+  TSDB_SQL_CREATE_DB,
+  TSDB_SQL_CREATE_TABLE,
+  TSDB_SQL_DROP_DB,
+  TSDB_SQL_DROP_TABLE,
+  TSDB_SQL_CREATE_ACCT,
+  TSDB_SQL_CREATE_USER,  // 10
+  TSDB_SQL_DROP_ACCT,
+  TSDB_SQL_DROP_USER,
+  TSDB_SQL_ALTER_USER,
+  TSDB_SQL_ALTER_ACCT,
+  TSDB_SQL_ALTER_TABLE,
+  TSDB_SQL_ALTER_DB,
+  TSDB_SQL_CREATE_MNODE,
+  TSDB_SQL_DROP_MNODE,
+  TSDB_SQL_CREATE_DNODE,
+  TSDB_SQL_DROP_DNODE,  // 20
+  TSDB_SQL_CFG_DNODE,
+  TSDB_SQL_CFG_MNODE,
+  TSDB_SQL_SHOW,
+  TSDB_SQL_RETRIEVE,
+  TSDB_SQL_KILL_QUERY,
+  TSDB_SQL_KILL_STREAM,
+  TSDB_SQL_KILL_CONNECTION,
+
+  TSDB_SQL_READ,  // SQL below is for read operation
+  TSDB_SQL_CONNECT,
+  TSDB_SQL_USE_DB,  // 30
+  TSDB_SQL_META,
+  TSDB_SQL_METRIC,
+  TSDB_SQL_MULTI_META,
+  TSDB_SQL_HB,
+
+  TSDB_SQL_LOCAL,  // SQL below for client local
+  TSDB_SQL_DESCRIBE_TABLE,
+  TSDB_SQL_RETRIEVE_METRIC,
+  TSDB_SQL_METRIC_JOIN_RETRIEVE,
+  TSDB_SQL_RETRIEVE_TAGS,
+
+  /*
+   * build empty result instead of accessing dnode to fetch result
+   * reset the client cache
+   */
+  TSDB_SQL_RETRIEVE_EMPTY_RESULT,  // 40
+
+  TSDB_SQL_RESET_CACHE,
+  TSDB_SQL_SERV_STATUS,
+  TSDB_SQL_CURRENT_DB,
+  TSDB_SQL_SERV_VERSION,
+  TSDB_SQL_CLI_VERSION,
+  TSDB_SQL_CURRENT_USER,
+  TSDB_SQL_CFG_LOCAL,
+
+  TSDB_SQL_MAX  // 48
+};
+
+
+// create table operation type
+enum TSQL_TYPE {
+  TSQL_CREATE_TABLE = 0x1,
+  TSQL_CREATE_STABLE = 0x2,
+  TSQL_CREATE_TABLE_FROM_STABLE = 0x3,
+  TSQL_CREATE_STREAM = 0x4,
+};
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // TDENGINE_QSQLCMD_H

src/util/inc/tast.h → src/query/inc/tast.h

@@ -20,13 +20,11 @@
 extern "C" {
 #endif
 
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include "os.h"
 
 #include "taosmsg.h"
 #include "ttypes.h"
-#include "os.h"
+#include "tvariant.h"
 
 struct tSQLBinaryExpr;
 struct SSchema;

src/inc/tresultBuf.h → src/query/inc/tresultBuf.h

+/*
+ * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
+ *
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #ifndef TDENGINE_VNODEQUERYUTIL_H
 #define TDENGINE_VNODEQUERYUTIL_H
 

src/util/inc/tsqlfunction.h → src/query/inc/tsqlfunction.h

@@ -25,6 +25,7 @@ extern "C" {
 
 #include "trpc.h"
 #include "ttypes.h"
+#include "tvariant.h"
 
 #define TSDB_FUNC_INVALID_ID  -1
 #define TSDB_FUNC_COUNT        0

src/query/inc/tvariant.h

+/*
+ * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
+ *
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef TDENGINE_TVARIANT_H
+#define TDENGINE_TVARIANT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// variant, each number/string/field_id has a corresponding struct during parsing sql
+typedef struct tVariant {
+  uint32_t nType;
+  int32_t  nLen;  // only used for string, for number, it is useless
+  union {
+    int64_t  i64Key;
+    double   dKey;
+    char *   pz;
+    wchar_t *wpz;
+  };
+} tVariant;
+
+void tVariantCreate(tVariant *pVar, SSQLToken *token);
+
+void tVariantCreateFromString(tVariant *pVar, char *pz, uint32_t len, uint32_t type);
+
+void tVariantCreateFromBinary(tVariant *pVar, char *pz, uint32_t len, uint32_t type);
+
+void tVariantDestroy(tVariant *pV);
+
+void tVariantAssign(tVariant *pDst, const tVariant *pSrc);
+
+int32_t tVariantToString(tVariant *pVar, char *dst);
+
+int32_t tVariantDump(tVariant *pVariant, char *payload, char type);
+
+int32_t tVariantTypeSetType(tVariant *pVariant, char type);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // TDENGINE_TVARIANT_H

src/client/src/sql.c → src/query/src/sql.c

@@ -25,13 +25,18 @@
 #include <stdio.h>
 /************ Begin %include sections from the grammar ************************/
 
+#include <assert.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <assert.h>
-#include <stdbool.h>
-#include "tscSQLParser.h"
+#include "qsqlparser.h"
+#include "tstoken.h"
 #include "tutil.h"
+#include "tvariant.h"
+#include "ttokendef.h"
+#include "qsqltype.h"
+
 /**************** End of %include directives **********************************/
 /* These constants specify the various numeric values for terminal symbols
 ** in a format understandable to "makeheaders".  This section is blank unless

src/client/src/tscSQLParserImpl.c → src/query/src/tscSQLParserImpl.c

@@ -13,13 +13,16 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <qsqltype.h>
 #include "os.h"
+#include "qsqlparser.h"
 #include "taosmsg.h"
 #include "tglobalcfg.h"
 #include "tlog.h"
-#include "tscSQLParser.h"
 #include "tstoken.h"
 #include "ttime.h"
+#include "ttokendef.h"
+#include "ttypes.h"
 #include "tutil.h"
 
 int32_t tSQLParse(SSqlInfo *pSQLInfo, const char *pStr) {

src/client/src/tscSyntaxtreefunction.c → src/query/src/tscSyntaxtreefunction.c

@@ -16,7 +16,6 @@
 #include "os.h"
 
 #include "tscSyntaxtreefunction.h"
-#include "tscSQLParser.h"
 #include "ttypes.h"
 #include "tutil.h"
 

src/util/src/ttokenizer.c → src/query/src/ttokenizer.c

@@ -13,14 +13,14 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "os.h"
+#include "hash.h"
 #include "hashutil.h"
+#include "os.h"
 #include "shash.h"
-#include "tutil.h"
-#include "tsqldef.h"
 #include "tstoken.h"
+#include "ttokendef.h"
 #include "ttypes.h"
-#include "hash.h"
+#include "tutil.h"
 
 // All the keywords of the SQL language are stored in a hash table
 typedef struct SKeyword {

src/util/inc/sskiplist.h

@@ -12,6 +12,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
+#if 0
 
 #ifndef TBASE_TSKIPLIST_H
 #define TBASE_TSKIPLIST_H
@@ -203,3 +204,4 @@ tSkipListNode *tSkipListIteratorGet(SSkipListIterator *iter);
 #endif
 
 #endif  // TBASE_TSKIPLIST_H
+#endif
\ No newline at end of file

src/util/inc/tstoken.h

@@ -20,7 +20,7 @@
 extern "C" {
 #endif
 
-#include <stdbool.h>
+#include "os.h"
 
 #define TK_SPACE      200
 #define TK_COMMENT    201

src/util/inc/ttypes.h

@@ -35,14 +35,28 @@ extern "C" {
 
 #define POINTER_BYTES sizeof(void *)  // 8 by default  assert(sizeof(ptrdiff_t) == sizseof(void*)
 
-typedef struct tDataDescriptor {
+#define TSDB_DATA_BOOL_NULL             0x02
+#define TSDB_DATA_TINYINT_NULL          0x80
+#define TSDB_DATA_SMALLINT_NULL         0x8000
+#define TSDB_DATA_INT_NULL              0x80000000
+#define TSDB_DATA_BIGINT_NULL           0x8000000000000000L
+
+#define TSDB_DATA_FLOAT_NULL            0x7FF00000              // it is an NAN
+#define TSDB_DATA_DOUBLE_NULL           0x7FFFFF0000000000L     // an NAN
+#define TSDB_DATA_NCHAR_NULL            0xFFFFFFFF
+#define TSDB_DATA_BINARY_NULL           0xFF
+
+#define TSDB_DATA_NULL_STR              "NULL"
+#define TSDB_DATA_NULL_STR_L            "null"
+
+typedef struct tDataTypeDescriptor {
   int16_t nType;
   int16_t nameLen;
   int32_t nSize;
   char *  aName;
-} tDataDescriptor;
+} tDataTypeDescriptor;
 
-extern tDataDescriptor tDataTypeDesc[11];
+extern tDataTypeDescriptor tDataTypeDesc[11];
 
 bool isValidDataType(int32_t type, int32_t length);
 bool isNull(const char *val, int32_t type);
@@ -53,34 +67,6 @@ void setNullN(char *val, int32_t type, int32_t bytes, int32_t numOfElems);
 void assignVal(char *val, const char *src, int32_t len, int32_t type);
 void tsDataSwap(void *pLeft, void *pRight, int32_t type, int32_t size);
 
-// variant, each number/string/field_id has a corresponding struct during parsing sql
-typedef struct tVariant {
-  uint32_t nType;
-  int32_t  nLen;  // only used for string, for number, it is useless
-  union {
-    int64_t  i64Key;
-    double   dKey;
-    char *   pz;
-    wchar_t *wpz;
-  };
-} tVariant;
-
-void tVariantCreate(tVariant *pVar, SSQLToken *token);
-
-void tVariantCreateFromString(tVariant *pVar, char *pz, uint32_t len, uint32_t type);
-
-void tVariantCreateFromBinary(tVariant *pVar, char *pz, uint32_t len, uint32_t type);
-
-void tVariantDestroy(tVariant *pV);
-
-void tVariantAssign(tVariant *pDst, const tVariant *pSrc);
-
-int32_t tVariantToString(tVariant *pVar, char *dst);
-
-int32_t tVariantDump(tVariant *pVariant, char *payload, char type);
-
-int32_t tVariantTypeSetType(tVariant *pVariant, char type);
-
 #ifdef __cplusplus
 }
 #endif

src/util/src/sskiplist.c

@@ -12,6 +12,8 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
+
+#if 0
 #include "os.h"
 
 #include "tlog.h"
@@ -842,3 +844,5 @@ int32_t tSkipListPointQuery(tSkipList *pSkipList, tSkipListKey *pKey, int32_t nu
     return retLen;
   }
 }
+
+#endif
\ No newline at end of file

src/vnode/detail/src/vnodeSupertableQuery.c

@@ -726,7 +726,7 @@ static int32_t mgmtFilterMeterByIndex(STabObj* pMetric, tQueryResultset* pRes, c
                                        .setupInfoFn = (__do_filter_suppl_fn_t)filterPrepare,
                                        .pExtInfo = &s};
 
-    tSQLBinaryExprTraverse(pExpr, pMetric->pSkipList, pRes, &supp);
+//    tSQLBinaryExprTraverse(pExpr, pMetric->pSkipList, pRes, &supp);
     tSQLBinaryExprDestroy(&pExpr, tSQLListTraverseDestroyInfo);
   }