feat: support geometry (not include schemaless)

taosdata · Sep 15, 2023 · fb60784 · fb60784
1 parent 3f8a5dd
commit fb60784
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 8 deletions.
diff --git a/src/benchData.c b/src/benchData.c
@@ -646,7 +646,8 @@ static int generateRandDataSQL(SSuperTable *stbInfo, char *sampleDataBuf,
                     break;
                 }
                 case TSDB_DATA_TYPE_BINARY:
-                case TSDB_DATA_TYPE_NCHAR: {
+                case TSDB_DATA_TYPE_NCHAR:
+                case TSDB_DATA_TYPE_GEOMETRY: {
                     char *tmp = benchCalloc(1, field->length + 1, false);
                     if (0 != tmpStr(tmp, stbInfo->iface, field, i)) {
                         free(tmp);

diff --git a/src/benchInsert.c b/src/benchInsert.c
@@ -231,7 +231,8 @@ static int createSuperTable(SDataBase* database, SSuperTable* stbInfo) {
         Field * col = benchArrayGet(stbInfo->cols, colIndex);
         int n;
         if (col->type == TSDB_DATA_TYPE_BINARY ||
-                col->type == TSDB_DATA_TYPE_NCHAR) {
+            col->type == TSDB_DATA_TYPE_NCHAR ||
+            col->type == TSDB_DATA_TYPE_GEOMETRY) {
             n = snprintf(colsBuf + len, col_buffer_len - len,
                     ",%s %s(%d)", col->name,
                     convertDatatypeToString(col->type), col->length);
@@ -282,7 +283,8 @@ static int createSuperTable(SDataBase* database, SSuperTable* stbInfo) {
     for (tagIndex = 0; tagIndex < stbInfo->tags->size; tagIndex++) {
         Field *tag = benchArrayGet(stbInfo->tags, tagIndex);
         if (tag->type == TSDB_DATA_TYPE_BINARY ||
-                tag->type == TSDB_DATA_TYPE_NCHAR) {
+            tag->type == TSDB_DATA_TYPE_NCHAR ||
+            tag->type == TSDB_DATA_TYPE_GEOMETRY) {
             n = snprintf(tagsBuf + len, tag_buffer_len - len,
                     "%s %s(%d),", tag->name,
                     convertDatatypeToString(tag->type), tag->length);
@@ -1738,7 +1740,7 @@ static void *syncWriteInterlace(void *sarg) {
             infoPrint(
                     "thread[%d] has currently inserted rows: %" PRIu64
                     ", peroid insert rate: %.3f rows/s \n",
-                    pThreadInfo->threadID, pThreadInfo->totalInsertRows, 
+                    pThreadInfo->threadID, pThreadInfo->totalInsertRows,
                     (double)(pThreadInfo->totalInsertRows - lastTotalInsertRows) * 1000.0/(currentPrintTime - lastPrintTime));
             lastPrintTime = currentPrintTime;
 	    lastTotalInsertRows = pThreadInfo->totalInsertRows;

diff --git a/src/benchJsonOpt.c b/src/benchJsonOpt.c
@@ -92,7 +92,8 @@ static int getColumnAndTagTypeFromInsertJsonFile(
         } else {
             if (type == TSDB_DATA_TYPE_BINARY
                 || type == TSDB_DATA_TYPE_JSON
-                || type == TSDB_DATA_TYPE_NCHAR) {
+                || type == TSDB_DATA_TYPE_NCHAR
+                || type == TSDB_DATA_TYPE_GEOMETRY) {
                 length = g_arguments->binwidth;
             } else {
                 length = convertTypeToLength(type);
@@ -1748,7 +1749,7 @@ static int getMetaFromTmqJsonFile(tools_cJSON *json) {
     if (tools_cJSON_IsString(groupMode)) {
         g_tmqInfo.consumerInfo.groupMode = groupMode->valuestring;
     }
-	
+
 
     tools_cJSON *pollDelay = tools_cJSON_GetObjectItem(tmqInfo, "poll_delay");
     if (tools_cJSON_IsNumber(pollDelay)) {

diff --git a/src/benchUtil.c b/src/benchUtil.c
@@ -320,7 +320,7 @@ void closeBenchConn(SBenchConn* conn) {
         if(conn->taos) {
             taos_close(conn->taos);
             conn->taos = NULL;
-        }        
+        }
         if (conn->ctaos) {
             taos_close(conn->ctaos);
             conn->ctaos = NULL;
@@ -833,6 +833,8 @@ char *convertDatatypeToString(int type) {
             return "double";
         case TSDB_DATA_TYPE_JSON:
             return "json";
+        case TSDB_DATA_TYPE_GEOMETRY:
+            return "geometry";
         default:
             break;
     }
@@ -965,6 +967,8 @@ int convertStringToDatatype(char *type, int length) {
             return TSDB_DATA_TYPE_JSON;
         } else if (0 == strcasecmp(type, "varchar")) {
             return TSDB_DATA_TYPE_BINARY;
+        } else if (0 == strcasecmp(type, "geometry")) {
+            return TSDB_DATA_TYPE_GEOMETRY;
         } else {
             errorPrint("unknown data type: %s\n", type);
             exit(EXIT_FAILURE);
@@ -1002,6 +1006,8 @@ int convertStringToDatatype(char *type, int length) {
             return TSDB_DATA_TYPE_JSON;
         } else if (0 == strncasecmp(type, "varchar", length)) {
             return TSDB_DATA_TYPE_BINARY;
+        } else if (0 == strcasecmp(type, "geometry")) {
+            return TSDB_DATA_TYPE_GEOMETRY;
         } else {
             errorPrint("unknown data type: %s\n", type);
             exit(EXIT_FAILURE);
@@ -1184,7 +1190,7 @@ void destroySockFd(int sockfd) {
     if (sockfd < 0) {
         return;
     }
-    
+
     // shutdown the connection since no more data will be sent
     int result;
     result = shutdown(sockfd, SHUT_WR);