refactor: schemaless function

include/util/taoserror.h

@@ -625,6 +625,10 @@ int32_t* taosGetErrno();
 #define TSDB_CODE_FUNC_FUNTION_PARA_TYPE        TAOS_DEF_ERROR_CODE(0, 0x2802)
 #define TSDB_CODE_FUNC_FUNTION_PARA_VALUE       TAOS_DEF_ERROR_CODE(0, 0x2803)
 
+#define TSDB_CODE_SML_INVALID_PROTOCOL_TYPE     TAOS_DEF_ERROR_CODE(0, 0x3000)
+#define TSDB_CODE_SML_INVALID_PRECISION_TYPE    TAOS_DEF_ERROR_CODE(0, 0x3001)
+#define TSDB_CODE_SML_INVALID_DATA              TAOS_DEF_ERROR_CODE(0, 0x3002)
+
 #ifdef __cplusplus
 }
 #endif

source/client/inc/tscParseLine.h

+/*
+ * Copyright (c) 2021 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_TSCPARSELINE_H
+#define TDENGINE_TSCPARSELINE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "thash.h"
+#include "clientint.h"
+
+#define SML_TIMESTAMP_SECOND_DIGITS 10
+#define SML_TIMESTAMP_MILLI_SECOND_DIGITS 13
+
+typedef TSDB_SML_PROTOCOL_TYPE SMLProtocolType;
+
+typedef struct {
+  const char* key;
+  int32_t keyLen;
+  uint8_t type;
+  int16_t length;
+  const char* value;
+  int32_t valueLen;
+} TAOS_SML_KV;
+
+typedef struct {
+  const char* measure;
+  const char* tags;
+  const char* cols;
+  const char* timestamp;
+
+  int32_t measureLen;
+  int32_t measureTagsLen;
+  int32_t tagsLen;
+  int32_t colsLen;
+} TAOS_PARSE_ELEMENTS;
+
+typedef struct {
+  char* childTableName;
+
+  SArray* tags;
+  SArray *cols;
+} TAOS_SML_DATA_POINT_TAGS;
+
+typedef struct SSmlSTableMeta {
+  char     *sTableName;   // super table name
+  uint8_t  sTableNameLen;
+  uint8_t  precision;     // the number of precision
+  SHashObj* tagHash;
+  SHashObj* fieldHash;
+} SSmlSTableMeta;
+
+typedef enum {
+  SML_TIME_STAMP_NOT_CONFIGURED,
+  SML_TIME_STAMP_HOURS,
+  SML_TIME_STAMP_MINUTES,
+  SML_TIME_STAMP_SECONDS,
+  SML_TIME_STAMP_MILLI_SECONDS,
+  SML_TIME_STAMP_MICRO_SECONDS,
+  SML_TIME_STAMP_NANO_SECONDS,
+  SML_TIME_STAMP_NOW
+} SMLTimeStampType;
+
+typedef struct {
+  uint64_t id;
+
+  STscObj*      taos;
+  SCatalog*     pCatalog;
+
+  SMLProtocolType protocol;
+  SMLTimeStampType tsType;
+
+  int32_t affectedRows;
+
+  SHashObj* childTables;
+  SHashObj* superTables;
+} SSmlLinesInfo;
+
+int tscSmlInsert(TAOS* taos, TAOS_SML_DATA_POINT* points, int numPoint, SSmlLinesInfo* info);
+bool checkDuplicateKey(char *key, SHashObj *pHash, SSmlLinesInfo* info);
+bool isValidInteger(char *str);
+bool isValidFloat(char *str);
+
+int32_t isValidChildTableName(const char *pTbName, int16_t len, SSmlLinesInfo* info);
+
+bool convertSmlValueType(TAOS_SML_KV *pVal, char *value,
+                         uint16_t len, SSmlLinesInfo* info, bool isTag);
+int32_t convertSmlTimeStamp(TAOS_SML_KV *pVal, char *value,
+                            uint16_t len, SSmlLinesInfo* info);
+
+void destroySmlDataPoint(TAOS_SML_DATA_POINT* point);
+
+int taos_insert_lines(TAOS* taos, char* lines[], int numLines, SMLProtocolType protocol,
+                      SMLTimeStampType tsType, int* affectedRows);
+int taos_insert_telnet_lines(TAOS* taos, char* lines[], int numLines, SMLProtocolType protocol,
+                             SMLTimeStampType tsType, int* affectedRows);
+int taos_insert_json_payload(TAOS* taos, char* payload, SMLProtocolType protocol,
+                             SMLTimeStampType tsType, int* affectedRows);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // TDENGINE_TSCPARSELINE_H

source/client/schemaless/CMakeLists.txt

+aux_source_directory(src SCHEMALESS_SRC)
+add_library(schemaless STATIC ${SCHEMALESS_SRC})
+
+target_include_directories(
+        schemaless
+        PUBLIC "${TD_SOURCE_DIR}/include/libs/schemaless"
+        PRIVATE "inc"
+)
+
+target_link_libraries(
+        schemaless
+        PUBLIC os util common catalog qcom
+)
+
+if(${BUILD_TEST})
+    ADD_SUBDIRECTORY(test)
+endif(${BUILD_TEST})

source/libs/CMakeLists.txt

@@ -17,4 +17,4 @@ add_subdirectory(tfs)
 add_subdirectory(monitor)
 add_subdirectory(nodes)
 add_subdirectory(scalar)
-add_subdirectory(command)
+add_subdirectory(command)
\ No newline at end of file

source/libs/scalar/test/scalar/scalarTests.cpp

@@ -127,7 +127,7 @@ void scltMakeValueNode(SNode **pNode, int32_t dataType, void *value) {
   *pNode = (SNode *)vnode;
 }
 
-void scltMakeColumnNode(SNode **pNode, SSDataBlock **block, int32_t dataType, int32_t dataBytes, int32_t rowNum, void *value) {
+void scltMakeColumnNode(SNode **pNode, SSDataBlock **block, int32_t dataType, int32_t dataBytes, int32_t ronwNum, void *value) {
   SNode *node = (SNode*)nodesMakeNode(QUERY_NODE_COLUMN);
   SColumnNode *rnode = (SColumnNode *)node;
   rnode->node.resType.type = dataType;
@@ -156,9 +156,9 @@ void scltMakeColumnNode(SNode **pNode, SSDataBlock **block, int32_t dataType, in
     idata.info.colId = 3;
     int32_t size = idata.info.bytes * rowNum;
     idata.pData = (char *)taosMemoryCalloc(1, size);
+    colInfoDataEnsureCapacity(&idata, 0, rowNum);
+
     taosArrayPush(res->pDataBlock, &idata);
-    
-    blockDataEnsureCapacity(res, rowNum);
 
     SColumnInfoData *pColumn = (SColumnInfoData *)taosArrayGetLast(res->pDataBlock);
     for (int32_t i = 0; i < rowNum; ++i) {

source/util/src/terror.c

@@ -438,6 +438,11 @@ TAOS_DEFINE_ERROR(TSDB_CODE_QW_MSG_ERROR,                 "Invalid msg order")
 //planner
 TAOS_DEFINE_ERROR(TSDB_CODE_PLAN_INTERNAL_ERROR,          "planner internal error")
 
+//schemaless
+TAOS_DEFINE_ERROR(TSDB_CODE_SML_INVALID_PROTOCOL_TYPE,    "Invalid line protocol type")
+TAOS_DEFINE_ERROR(TSDB_CODE_SML_INVALID_PRECISION_TYPE,   "Invalid timestamp precision type")
+TAOS_DEFINE_ERROR(TSDB_CODE_SML_INVALID_DATA,             "Invalid data type")
+
 #ifdef TAOS_ERROR_C
 };
 #endif