diff --git a/deps/cJson/inc/cJSON.h b/deps/cJson/inc/cJSON.h index cdd5faa52399e83dd2c07174a025eae52a3c1b61..f25aaa11b14636e4b17e6acf168f6971aef036ea 100644 --- a/deps/cJson/inc/cJSON.h +++ b/deps/cJson/inc/cJSON.h @@ -73,7 +73,7 @@ typedef struct cJSON char *string; //Keep the original string of number - char numberstring[13]; + char numberstring[64]; } cJSON; typedef struct cJSON_Hooks diff --git a/deps/cJson/src/cJSON.c b/deps/cJson/src/cJSON.c index f0ef9f6fe1715336ed8d24d4998df5a8ba51b3af..ff93e8730d4e9b378efaa5c9039eb886e3a30e97 100644 --- a/deps/cJson/src/cJSON.c +++ b/deps/cJson/src/cJSON.c @@ -290,7 +290,7 @@ loop_end: input_buffer->offset += (size_t)(after_end - number_c_string); - strncpy(item->numberstring, (const char *)number_c_string, 12); + strncpy(item->numberstring, (const char *)number_c_string, strlen((const char*)number_c_string)); return true; } diff --git a/src/client/inc/tscParseLine.h b/src/client/inc/tscParseLine.h index e36c0bbc0b2d9c02e798aed1fe1e68dbe02939f5..8c7aaad81b5330ae15ae0670f98390b2e8a93c8f 100644 --- a/src/client/inc/tscParseLine.h +++ b/src/client/inc/tscParseLine.h @@ -47,6 +47,12 @@ typedef enum { SML_TIME_STAMP_NANO_SECONDS } SMLTimeStampType; +typedef enum { + SML_LINE_PROTOCOL = 0, + SML_TELNET_PROTOCOL = 1, + SML_JSON_PROTOCOL = 2, +} SMLProtocolType; + typedef struct { uint64_t id; SHashObj* smlDataToSchema; @@ -57,7 +63,7 @@ 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); +int32_t isValidChildTableName(const char *pTbName, int16_t len, SSmlLinesInfo* info); bool convertSmlValueType(TAOS_SML_KV *pVal, char *value, uint16_t len, SSmlLinesInfo* info); @@ -66,6 +72,11 @@ int32_t convertSmlTimeStamp(TAOS_SML_KV *pVal, char *value, void destroySmlDataPoint(TAOS_SML_DATA_POINT* point); +int taos_insert_sml_lines(TAOS* taos, char* lines[], int numLines); +int taos_insert_telnet_lines(TAOS* taos, char* lines[], int numLines); +int taos_insert_json_payload(TAOS* taos, char* payload); + + #ifdef __cplusplus } #endif diff --git a/src/client/src/TSDBJNIConnector.c b/src/client/src/TSDBJNIConnector.c index 925b7d75db9f88c9905270aa365c60990e9f45a3..4828b52853180c08e8e669d00083e3002fc0eb62 100644 --- a/src/client/src/TSDBJNIConnector.c +++ b/src/client/src/TSDBJNIConnector.c @@ -17,6 +17,7 @@ #include "taos.h" #include "tlog.h" #include "tscUtil.h" +#include "tscParseLine.h" #include "com_taosdata_jdbc_TSDBJNIConnector.h" @@ -1070,7 +1071,7 @@ JNIEXPORT jlong JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_insertLinesImp(J c_lines[i] = (char *)(*env)->GetStringUTFChars(env, line, 0); } - int code = taos_insert_lines(taos, c_lines, numLines); + int code = taos_schemaless_insert(taos, c_lines, numLines, SML_LINE_PROTOCOL); for (int i = 0; i < numLines; ++i) { jstring line = (jstring)((*env)->GetObjectArrayElement(env, lines, i)); @@ -1084,4 +1085,4 @@ JNIEXPORT jlong JNICALL Java_com_taosdata_jdbc_TSDBJNIConnector_insertLinesImp(J return JNI_TDENGINE_ERROR; } return code; -} \ No newline at end of file +} diff --git a/src/client/src/tscParseLineProtocol.c b/src/client/src/tscParseLineProtocol.c index 382198e8b3e8422651b0072818a73bbd7b5c6feb..9fb427bed81c1e124155442d219ef4230b50038a 100644 --- a/src/client/src/tscParseLineProtocol.c +++ b/src/client/src/tscParseLineProtocol.c @@ -1811,8 +1811,8 @@ static int32_t parseSmlKey(TAOS_SML_KV *pKV, const char **index, SHashObj *pHash return TSDB_CODE_TSC_LINE_SYNTAX_ERROR; } while (*cur != '\0') { - if (len > TSDB_COL_NAME_LEN) { - tscError("SML:0x%"PRIx64" Key field cannot exceeds 65 characters", info->id); + if (len >= TSDB_COL_NAME_LEN - 1) { + tscError("SML:0x%"PRIx64" Key field cannot exceeds %d characters", info->id, TSDB_COL_NAME_LEN - 1); return TSDB_CODE_TSC_INVALID_COLUMN_LENGTH; } //unescaped '=' identifies a tag key @@ -1898,8 +1898,8 @@ static int32_t parseSmlMeasurement(TAOS_SML_DATA_POINT *pSml, const char **index } while (*cur != '\0') { - if (len > TSDB_TABLE_NAME_LEN) { - tscError("SML:0x%"PRIx64" Measurement field cannot exceeds 193 characters", info->id); + if (len >= TSDB_TABLE_NAME_LEN - 1) { + tscError("SML:0x%"PRIx64" Measurement field cannot exceeds %d characters", info->id, TSDB_TABLE_NAME_LEN - 1); free(pSml->stableName); pSml->stableName = NULL; return TSDB_CODE_TSC_INVALID_TABLE_ID_LENGTH; @@ -1917,7 +1917,7 @@ static int32_t parseSmlMeasurement(TAOS_SML_DATA_POINT *pSml, const char **index if (*cur == '\\') { escapeSpecialCharacter(1, &cur); } - pSml->stableName[len] = *cur; + pSml->stableName[len] = tolower(*cur); cur++; len++; } @@ -1929,7 +1929,11 @@ static int32_t parseSmlMeasurement(TAOS_SML_DATA_POINT *pSml, const char **index } //Table name can only contain digits(0-9),alphebet(a-z),underscore(_) -int32_t isValidChildTableName(const char *pTbName, int16_t len) { +int32_t isValidChildTableName(const char *pTbName, int16_t len, SSmlLinesInfo* info) { + if (len > TSDB_TABLE_NAME_LEN - 1) { + tscError("SML:0x%"PRIx64" child table name cannot exceeds %d characters", info->id, TSDB_TABLE_NAME_LEN - 1); + return TSDB_CODE_TSC_INVALID_TABLE_ID_LENGTH; + } const char *cur = pTbName; for (int i = 0; i < len; ++i) { if(!isdigit(cur[i]) && !isalpha(cur[i]) && (cur[i] != '_')) { @@ -1975,12 +1979,13 @@ static int32_t parseSmlKvPairs(TAOS_SML_KV **pKVs, int *num_kvs, } if (!isField && (strcasecmp(pkv->key, "ID") == 0) && pkv->type == TSDB_DATA_TYPE_BINARY) { - ret = isValidChildTableName(pkv->value, pkv->length); + ret = isValidChildTableName(pkv->value, pkv->length, info); if (ret) { goto error; } smlData->childTableName = malloc( pkv->length + 1); memcpy(smlData->childTableName, pkv->value, pkv->length); + strntolower_s(smlData->childTableName, smlData->childTableName, (int32_t)pkv->length); smlData->childTableName[pkv->length] = '\0'; free(pkv->key); free(pkv->value); @@ -2184,3 +2189,43 @@ cleanup: return code; } +/** + * taos_schemaless_insert() parse and insert data points into database according to + * different protocol. + * + * @param $lines input array may contain multiple lines, each line indicates a data point. + * If protocol=2 is used input array should contain single JSON + * string(e.g. char *lines[] = {"$JSON_string"}). If need to insert + * multiple data points in JSON format, should include them in $JSON_string + * as a JSON array. + * @param $numLines indicates how many data points in $lines. + * If protocol = 2 is used this param will be ignored as $lines should + * contain single JSON string. + * @param $protocol indicates which protocol to use for parsing: + * 0 - influxDB line protocol + * 1 - OpenTSDB telnet line protocol + * 2 - OpenTSDB JSON format protocol + * @return return zero for successful insertion. Otherwise return none-zero error code of + * failure reason. + * + */ + +int taos_schemaless_insert(TAOS* taos, char* lines[], int numLines, int protocol) { + int code; + switch (protocol) { + case SML_LINE_PROTOCOL: + code = taos_insert_lines(taos, lines, numLines); + break; + case SML_TELNET_PROTOCOL: + code = taos_insert_telnet_lines(taos, lines, numLines); + break; + case SML_JSON_PROTOCOL: + code = taos_insert_json_payload(taos, *lines); + break; + default: + code = TSDB_CODE_TSC_INVALID_PROTOCOL_TYPE; + break; + } + + return code; +} diff --git a/src/client/src/tscParseOpenTSDB.c b/src/client/src/tscParseOpenTSDB.c index 14693ae361b533287e3377e644908c5c8a613c79..08d739cae47b30b8f143da5127ee90a1558316dd 100644 --- a/src/client/src/tscParseOpenTSDB.c +++ b/src/client/src/tscParseOpenTSDB.c @@ -37,7 +37,7 @@ static int32_t parseTelnetMetric(TAOS_SML_DATA_POINT *pSml, const char **index, const char *cur = *index; uint16_t len = 0; - pSml->stableName = tcalloc(TSDB_TABLE_NAME_LEN + 1, 1); // +1 to avoid 1772 line over write + pSml->stableName = tcalloc(TSDB_TABLE_NAME_LEN, 1); if (pSml->stableName == NULL) { return TSDB_CODE_TSC_OUT_OF_MEMORY; } @@ -48,8 +48,8 @@ static int32_t parseTelnetMetric(TAOS_SML_DATA_POINT *pSml, const char **index, } while (*cur != '\0') { - if (len > TSDB_TABLE_NAME_LEN) { - tscError("OTD:0x%"PRIx64" Metric cannot exceeds 193 characters", info->id); + if (len >= TSDB_TABLE_NAME_LEN - 1) { + tscError("OTD:0x%"PRIx64" Metric cannot exceeds %d characters", info->id, TSDB_TABLE_NAME_LEN - 1); tfree(pSml->stableName); return TSDB_CODE_TSC_INVALID_TABLE_ID_LENGTH; } @@ -62,7 +62,7 @@ static int32_t parseTelnetMetric(TAOS_SML_DATA_POINT *pSml, const char **index, if (*cur == '.') { pSml->stableName[len] = '_'; } else { - pSml->stableName[len] = *cur; + pSml->stableName[len] = tolower(*cur); } cur++; @@ -171,7 +171,7 @@ static int32_t parseTelnetMetricValue(TAOS_SML_KV **pKVs, int *num_kvs, const ch static int32_t parseTelnetTagKey(TAOS_SML_KV *pKV, const char **index, SHashObj *pHash, SSmlLinesInfo* info) { const char *cur = *index; - char key[TSDB_COL_NAME_LEN + 1]; // +1 to avoid key[len] over write + char key[TSDB_COL_NAME_LEN]; uint16_t len = 0; //key field cannot start with digit @@ -180,8 +180,8 @@ static int32_t parseTelnetTagKey(TAOS_SML_KV *pKV, const char **index, SHashObj return TSDB_CODE_TSC_LINE_SYNTAX_ERROR; } while (*cur != '\0') { - if (len > TSDB_COL_NAME_LEN) { - tscError("OTD:0x%"PRIx64" Tag key cannot exceeds 65 characters", info->id); + if (len >= TSDB_COL_NAME_LEN - 1) { + tscError("OTD:0x%"PRIx64" Tag key cannot exceeds %d characters", info->id, TSDB_COL_NAME_LEN - 1); return TSDB_CODE_TSC_INVALID_COLUMN_LENGTH; } if (*cur == ' ') { @@ -276,13 +276,14 @@ static int32_t parseTelnetTagKvs(TAOS_SML_KV **pKVs, int *num_kvs, return ret; } if ((strcasecmp(pkv->key, "ID") == 0) && pkv->type == TSDB_DATA_TYPE_BINARY) { - ret = isValidChildTableName(pkv->value, pkv->length); + ret = isValidChildTableName(pkv->value, pkv->length, info); if (ret) { return ret; } *childTableName = malloc(pkv->length + 1); memcpy(*childTableName, pkv->value, pkv->length); (*childTableName)[pkv->length] = '\0'; + strntolower_s(*childTableName, *childTableName, (int32_t)pkv->length); tfree(pkv->key); tfree(pkv->value); } else { @@ -311,7 +312,7 @@ static int32_t parseTelnetTagKvs(TAOS_SML_KV **pKVs, int *num_kvs, return ret; } -int32_t tscParseTelnetLine(const char* line, TAOS_SML_DATA_POINT* smlData, SSmlLinesInfo* info) { +static int32_t tscParseTelnetLine(const char* line, TAOS_SML_DATA_POINT* smlData, SSmlLinesInfo* info) { const char* index = line; int32_t ret = TSDB_CODE_SUCCESS; @@ -354,7 +355,7 @@ int32_t tscParseTelnetLine(const char* line, TAOS_SML_DATA_POINT* smlData, SSmlL return TSDB_CODE_SUCCESS; } -int32_t tscParseTelnetLines(char* lines[], int numLines, SArray* points, SArray* failedLines, SSmlLinesInfo* info) { +static int32_t tscParseTelnetLines(char* lines[], int numLines, SArray* points, SArray* failedLines, SSmlLinesInfo* info) { for (int32_t i = 0; i < numLines; ++i) { TAOS_SML_DATA_POINT point = {0}; int32_t code = tscParseTelnetLine(lines[i], &point, info); @@ -438,15 +439,15 @@ int taos_telnet_insert(TAOS* taos, TAOS_SML_DATA_POINT* points, int numPoint) { /* telnet style API parser */ -int32_t parseMetricFromJSON(cJSON *root, TAOS_SML_DATA_POINT* pSml, SSmlLinesInfo* info) { +static int32_t parseMetricFromJSON(cJSON *root, TAOS_SML_DATA_POINT* pSml, SSmlLinesInfo* info) { cJSON *metric = cJSON_GetObjectItem(root, "metric"); if (!cJSON_IsString(metric)) { return TSDB_CODE_TSC_INVALID_JSON; } size_t stableLen = strlen(metric->valuestring); - if (stableLen > TSDB_TABLE_NAME_LEN) { - tscError("OTD:0x%"PRIx64" Metric cannot exceeds 193 characters in JSON", info->id); + if (stableLen > TSDB_TABLE_NAME_LEN - 1) { + tscError("OTD:0x%"PRIx64" Metric cannot exceeds %d characters in JSON", info->id, TSDB_TABLE_NAME_LEN - 1); return TSDB_CODE_TSC_INVALID_TABLE_ID_LENGTH; } @@ -462,19 +463,20 @@ int32_t parseMetricFromJSON(cJSON *root, TAOS_SML_DATA_POINT* pSml, SSmlLinesInf } //convert dot to underscore for now, will be removed once dot is allowed in tbname. - for (int i = 0; i < strlen(metric->valuestring); ++i) { + for (int i = 0; i < stableLen; ++i) { if (metric->valuestring[i] == '.') { metric->valuestring[i] = '_'; } } tstrncpy(pSml->stableName, metric->valuestring, stableLen + 1); + strntolower_s(pSml->stableName, pSml->stableName, (int32_t)stableLen); return TSDB_CODE_SUCCESS; } -int32_t parseTimestampFromJSONObj(cJSON *root, int64_t *tsVal, SSmlLinesInfo* info) { +static int32_t parseTimestampFromJSONObj(cJSON *root, int64_t *tsVal, SSmlLinesInfo* info) { int32_t size = cJSON_GetArraySize(root); if (size != OTD_JSON_SUB_FIELDS_NUM) { return TSDB_CODE_TSC_INVALID_JSON; @@ -490,7 +492,7 @@ int32_t parseTimestampFromJSONObj(cJSON *root, int64_t *tsVal, SSmlLinesInfo* in return TSDB_CODE_TSC_INVALID_JSON; } - *tsVal = value->valueint; + *tsVal = strtoll(value->numberstring, NULL, 10); //if timestamp value is 0 use current system time if (*tsVal == 0) { *tsVal = taosGetTimestampNs(); @@ -526,7 +528,7 @@ int32_t parseTimestampFromJSONObj(cJSON *root, int64_t *tsVal, SSmlLinesInfo* in return TSDB_CODE_SUCCESS; } -int32_t parseTimestampFromJSON(cJSON *root, TAOS_SML_KV **pTS, int *num_kvs, SSmlLinesInfo* info) { +static int32_t parseTimestampFromJSON(cJSON *root, TAOS_SML_KV **pTS, int *num_kvs, SSmlLinesInfo* info) { //Timestamp must be the first KV to parse assert(*num_kvs == 0); int64_t tsVal; @@ -538,7 +540,8 @@ int32_t parseTimestampFromJSON(cJSON *root, TAOS_SML_KV **pTS, int *num_kvs, SSm if (timestamp->valueint == 0) { tsVal = taosGetTimestampNs(); } else { - tsVal = convertTimePrecision(timestamp->valueint, TSDB_TIME_PRECISION_MICRO, TSDB_TIME_PRECISION_NANO); + tsVal = strtoll(timestamp->numberstring, NULL, 10); + tsVal = convertTimePrecision(tsVal, TSDB_TIME_PRECISION_MICRO, TSDB_TIME_PRECISION_NANO); } } else if (cJSON_IsObject(timestamp)) { int32_t ret = parseTimestampFromJSONObj(timestamp, &tsVal, info); @@ -567,7 +570,7 @@ int32_t parseTimestampFromJSON(cJSON *root, TAOS_SML_KV **pTS, int *num_kvs, SSm } -int32_t convertJSONBool(TAOS_SML_KV *pVal, char* typeStr, int64_t valueInt, SSmlLinesInfo* info) { +static int32_t convertJSONBool(TAOS_SML_KV *pVal, char* typeStr, int64_t valueInt, SSmlLinesInfo* info) { if (strcasecmp(typeStr, "bool") != 0) { tscError("OTD:0x%"PRIx64" invalid type(%s) for JSON Bool", info->id, typeStr); return TSDB_CODE_TSC_INVALID_JSON_TYPE; @@ -580,7 +583,7 @@ int32_t convertJSONBool(TAOS_SML_KV *pVal, char* typeStr, int64_t valueInt, SSml return TSDB_CODE_SUCCESS; } -int32_t convertJSONNumber(TAOS_SML_KV *pVal, char* typeStr, cJSON *value, SSmlLinesInfo* info) { +static int32_t convertJSONNumber(TAOS_SML_KV *pVal, char* typeStr, cJSON *value, SSmlLinesInfo* info) { //tinyint if (strcasecmp(typeStr, "i8") == 0 || strcasecmp(typeStr, "tinyint") == 0) { @@ -623,14 +626,19 @@ int32_t convertJSONNumber(TAOS_SML_KV *pVal, char* typeStr, cJSON *value, SSmlLi //bigint if (strcasecmp(typeStr, "i64") == 0 || strcasecmp(typeStr, "bigint") == 0) { - if (!IS_VALID_BIGINT(value->valueint)) { - tscError("OTD:0x%"PRIx64" JSON value(%"PRId64") cannot fit in type(bigint)", info->id, value->valueint); - return TSDB_CODE_TSC_VALUE_OUT_OF_RANGE; - } pVal->type = TSDB_DATA_TYPE_BIGINT; pVal->length = (int16_t)tDataTypes[pVal->type].bytes; pVal->value = tcalloc(pVal->length, 1); - *(int64_t *)(pVal->value) = (int64_t)(value->valueint); + /* cJSON conversion of legit BIGINT may overflow, + * use original string to do the conversion. + */ + errno = 0; + int64_t val = (int64_t)strtoll(value->numberstring, NULL, 10); + if (errno == ERANGE || !IS_VALID_BIGINT(val)) { + tscError("OTD:0x%"PRIx64" JSON value(%s) cannot fit in type(bigint)", info->id, value->numberstring); + return TSDB_CODE_TSC_VALUE_OUT_OF_RANGE; + } + *(int64_t *)(pVal->value) = val; return TSDB_CODE_SUCCESS; } //float @@ -665,7 +673,7 @@ int32_t convertJSONNumber(TAOS_SML_KV *pVal, char* typeStr, cJSON *value, SSmlLi return TSDB_CODE_TSC_INVALID_JSON_TYPE; } -int32_t convertJSONString(TAOS_SML_KV *pVal, char* typeStr, cJSON *value, SSmlLinesInfo* info) { +static int32_t convertJSONString(TAOS_SML_KV *pVal, char* typeStr, cJSON *value, SSmlLinesInfo* info) { if (strcasecmp(typeStr, "binary") == 0) { pVal->type = TSDB_DATA_TYPE_BINARY; } else if (strcasecmp(typeStr, "nchar") == 0) { @@ -680,7 +688,7 @@ int32_t convertJSONString(TAOS_SML_KV *pVal, char* typeStr, cJSON *value, SSmlLi return TSDB_CODE_SUCCESS; } -int32_t parseValueFromJSONObj(cJSON *root, TAOS_SML_KV *pVal, SSmlLinesInfo* info) { +static int32_t parseValueFromJSONObj(cJSON *root, TAOS_SML_KV *pVal, SSmlLinesInfo* info) { int32_t ret = TSDB_CODE_SUCCESS; int32_t size = cJSON_GetArraySize(root); @@ -728,7 +736,7 @@ int32_t parseValueFromJSONObj(cJSON *root, TAOS_SML_KV *pVal, SSmlLinesInfo* inf return TSDB_CODE_SUCCESS; } -int32_t parseValueFromJSON(cJSON *root, TAOS_SML_KV *pVal, SSmlLinesInfo* info) { +static int32_t parseValueFromJSON(cJSON *root, TAOS_SML_KV *pVal, SSmlLinesInfo* info) { int type = root->type; switch (type) { @@ -746,7 +754,16 @@ int32_t parseValueFromJSON(cJSON *root, TAOS_SML_KV *pVal, SSmlLinesInfo* info) pVal->type = TSDB_DATA_TYPE_BIGINT; pVal->length = (int16_t)tDataTypes[pVal->type].bytes; pVal->value = tcalloc(pVal->length, 1); - *(int64_t *)(pVal->value) = (int64_t)(root->valuedouble); + /* cJSON conversion of legit BIGINT may overflow, + * use original string to do the conversion. + */ + errno = 0; + int64_t val = (int64_t)strtoll(root->numberstring, NULL, 10); + if (errno == ERANGE || !IS_VALID_BIGINT(val)) { + tscError("OTD:0x%"PRIx64" JSON value(%s) cannot fit in type(bigint)", info->id, root->numberstring); + return TSDB_CODE_TSC_VALUE_OUT_OF_RANGE; + } + *(int64_t *)(pVal->value) = val; } else if (isValidFloat(root->numberstring)) { pVal->type = TSDB_DATA_TYPE_DOUBLE; pVal->length = (int16_t)tDataTypes[pVal->type].bytes; @@ -790,7 +807,7 @@ int32_t parseValueFromJSON(cJSON *root, TAOS_SML_KV *pVal, SSmlLinesInfo* info) return TSDB_CODE_SUCCESS; } -int32_t parseMetricValueFromJSON(cJSON *root, TAOS_SML_KV **pKVs, int *num_kvs, SSmlLinesInfo* info) { +static int32_t parseMetricValueFromJSON(cJSON *root, TAOS_SML_KV **pKVs, int *num_kvs, SSmlLinesInfo* info) { //skip timestamp TAOS_SML_KV *pVal = *pKVs + 1; char key[] = OTD_METRIC_VALUE_COLUMN_NAME; @@ -813,7 +830,9 @@ int32_t parseMetricValueFromJSON(cJSON *root, TAOS_SML_KV **pKVs, int *num_kvs, } -int32_t parseTagsFromJSON(cJSON *root, TAOS_SML_KV **pKVs, int *num_kvs, char **childTableName, SSmlLinesInfo* info) { + +static int32_t parseTagsFromJSON(cJSON *root, TAOS_SML_KV **pKVs, int *num_kvs, char **childTableName, + SHashObj *pHash, SSmlLinesInfo* info) { int32_t ret = TSDB_CODE_SUCCESS; cJSON *tags = cJSON_GetObjectItem(root, "tags"); @@ -825,16 +844,19 @@ int32_t parseTagsFromJSON(cJSON *root, TAOS_SML_KV **pKVs, int *num_kvs, char ** cJSON *id = cJSON_GetObjectItem(tags, "ID"); if (id != NULL) { size_t idLen = strlen(id->valuestring); - ret = isValidChildTableName(id->valuestring, (int16_t)idLen); + ret = isValidChildTableName(id->valuestring, (int16_t)idLen, info); if (ret != TSDB_CODE_SUCCESS) { return ret; } *childTableName = tcalloc(idLen + 1, sizeof(char)); memcpy(*childTableName, id->valuestring, idLen); - //remove all ID fields from tags list no case sensitive - while (id != NULL) { - cJSON_DeleteItemFromObject(tags, "ID"); - id = cJSON_GetObjectItem(tags, "ID"); + strntolower_s(*childTableName, *childTableName, (int32_t)idLen); + + //check duplicate IDs + cJSON_DeleteItemFromObject(tags, "ID"); + id = cJSON_GetObjectItem(tags, "ID"); + if (id != NULL) { + return TSDB_CODE_TSC_DUP_TAG_NAMES; } } @@ -853,8 +875,16 @@ int32_t parseTagsFromJSON(cJSON *root, TAOS_SML_KV **pKVs, int *num_kvs, char ** if (tag == NULL) { return TSDB_CODE_TSC_INVALID_JSON; } + //check duplicate keys + if (checkDuplicateKey(tag->string, pHash, info)) { + return TSDB_CODE_TSC_DUP_TAG_NAMES; + } //key size_t keyLen = strlen(tag->string); + if (keyLen > TSDB_COL_NAME_LEN - 1) { + tscError("OTD:0x%"PRIx64" Tag key cannot exceeds %d characters in JSON", info->id, TSDB_COL_NAME_LEN - 1); + return TSDB_CODE_TSC_INVALID_COLUMN_LENGTH; + } pkv->key = tcalloc(keyLen + 1, sizeof(char)); strncpy(pkv->key, tag->string, keyLen); //value @@ -864,13 +894,14 @@ int32_t parseTagsFromJSON(cJSON *root, TAOS_SML_KV **pKVs, int *num_kvs, char ** } *num_kvs += 1; pkv++; + } return ret; } -int32_t tscParseJSONPayload(cJSON *root, TAOS_SML_DATA_POINT* pSml, SSmlLinesInfo* info) { +static int32_t tscParseJSONPayload(cJSON *root, TAOS_SML_DATA_POINT* pSml, SSmlLinesInfo* info) { int32_t ret = TSDB_CODE_SUCCESS; if (!cJSON_IsObject(root)) { @@ -910,17 +941,20 @@ int32_t tscParseJSONPayload(cJSON *root, TAOS_SML_DATA_POINT* pSml, SSmlLinesInf tscDebug("OTD:0x%"PRIx64" Parse metric value from JSON payload finished", info->id); //Parse tags - ret = parseTagsFromJSON(root, &pSml->tags, &pSml->tagNum, &pSml->childTableName, info); + SHashObj *keyHashTable = taosHashInit(128, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BINARY), true, false); + ret = parseTagsFromJSON(root, &pSml->tags, &pSml->tagNum, &pSml->childTableName, keyHashTable, info); if (ret) { tscError("OTD:0x%"PRIx64" Unable to parse tags from JSON payload", info->id); + taosHashCleanup(keyHashTable); return ret; } tscDebug("OTD:0x%"PRIx64" Parse tags from JSON payload finished", info->id); + taosHashCleanup(keyHashTable); return TSDB_CODE_SUCCESS; } -int32_t tscParseMultiJSONPayload(char* payload, SArray* points, SSmlLinesInfo* info) { +static int32_t tscParseMultiJSONPayload(char* payload, SArray* points, SSmlLinesInfo* info) { int32_t payloadNum, ret; ret = TSDB_CODE_SUCCESS; diff --git a/src/connector/python/README.md b/src/connector/python/README.md index 95ef26e1f0e73cee7d47ecb6ece1d6a95d2f89d3..fbc67a6a8701dd173f3dd04f7a6dc35ef418b2d2 100644 --- a/src/connector/python/README.md +++ b/src/connector/python/README.md @@ -404,13 +404,13 @@ lines = [ 'st,t1=4i64,t3="t4",t2=5f64,t4=5f64 c1=3i64,c3=L"pass it again",c2=true,c4=5f64,c5=5f64,c6=7u64 1626006933640000000ns', 'stf,t1=4i64,t3="t4",t2=5f64,t4=5f64 c1=3i64,c3=L"pass it again_stf",c2=false,c5=5f64,c6=7u64 1626006933641000000ns', ] -conn.insert_lines(lines) +conn.schemaless_insert(lines, 0) print("inserted") lines = [ 'stf,t1=5i64,t3="t4",t2=5f64,t4=5f64 c1=3i64,c3=L"pass it again_stf",c2=false,c5=5f64,c6=7u64 1626006933641000000ns', ] -conn.insert_lines(lines) +conn.schemaless_insert(lines, 0) result = conn.query("show tables") for row in result: diff --git a/src/connector/python/examples/insert-lines.py b/src/connector/python/examples/insert-lines.py index 0096b7e8cdf1328ee78805a1ee3134ad7cdfc447..aceffe39889b157e9b32c8bdf4f4e61d45ae3488 100644 --- a/src/connector/python/examples/insert-lines.py +++ b/src/connector/python/examples/insert-lines.py @@ -9,10 +9,10 @@ conn.select_db(dbname) lines = [ 'st,t1=3i64,t2=4f64,t3="t3" c1=3i64,c3=L"pass",c2=false,c4=4f64 1626006833639000000ns', ] -conn.insert_lines(lines) +conn.schemaless_insert(lines, 0) print("inserted") -conn.insert_lines(lines) +conn.schemaless_insert(lines, 0) result = conn.query("show tables") for row in result: diff --git a/src/connector/python/taos/__init__.py b/src/connector/python/taos/__init__.py index 75138eade3d60f7894d814babe58cec7aecc9a20..bf2be15afee92a5740c605cbab2dbe889181e8e3 100644 --- a/src/connector/python/taos/__init__.py +++ b/src/connector/python/taos/__init__.py @@ -406,13 +406,13 @@ lines = [ 'st,t1=4i64,t3="t4",t2=5f64,t4=5f64 c1=3i64,c3=L"passitagin",c2=true,c4=5f64,c5=5f64,c6=7u64 1626006933640000000ns', 'stf,t1=4i64,t3="t4",t2=5f64,t4=5f64 c1=3i64,c3=L"passitagin_stf",c2=false,c5=5f64,c6=7u64 1626006933641000000ns', ] -conn.insert_lines(lines) +conn.schemaless_insert(lines, 0) print("inserted") lines = [ 'stf,t1=5i64,t3="t4",t2=5f64,t4=5f64 c1=3i64,c3=L"passitagin_stf",c2=false,c5=5f64,c6=7u64 1626006933641000000ns', ] -conn.insert_lines(lines) +conn.schemaless_insert(lines, 0) result = conn.query("show tables") for row in result: diff --git a/src/connector/python/taos/cinterface.py b/src/connector/python/taos/cinterface.py index c5737ea5a07b7678e058307dfe3b47546dd99909..e389c1ae94be841719fbc3aef733ca6d5c70d31e 100644 --- a/src/connector/python/taos/cinterface.py +++ b/src/connector/python/taos/cinterface.py @@ -809,40 +809,23 @@ def taos_stmt_use_result(stmt): return result try: - _libtaos.taos_insert_lines.restype = c_int - _libtaos.taos_insert_lines.argstype = c_void_p, c_void_p, c_int + _libtaos.taos_schemaless_insert.restype = c_int + _libtaos.taos_schemaless_insert.argstype = c_void_p, c_void_p, c_int except AttributeError: - print("WARNING: libtaos(%s) does not support insert_lines" % taos_get_client_info()) + print("WARNING: libtaos(%s) does not support schemaless_insert" % taos_get_client_info()) -def taos_insert_lines(connection, lines): +def taos_schemaless_insert(connection, lines, protocol): # type: (c_void_p, list[str] | tuple(str)) -> None num_of_lines = len(lines) lines = (c_char_p(line.encode("utf-8")) for line in lines) lines_type = ctypes.c_char_p * num_of_lines p_lines = lines_type(*lines) - errno = _libtaos.taos_insert_lines(connection, p_lines, num_of_lines) + errno = _libtaos.taos_schemaless_insert(connection, p_lines, num_of_lines, protocol) if errno != 0: - raise LinesError("insert lines error", errno) - -def taos_insert_telnet_lines(connection, lines): - # type: (c_void_p, list[str] | tuple(str)) -> None - num_of_lines = len(lines) - lines = (c_char_p(line.encode("utf-8")) for line in lines) - lines_type = ctypes.c_char_p * num_of_lines - p_lines = lines_type(*lines) - errno = _libtaos.taos_insert_telnet_lines(connection, p_lines, num_of_lines) - if errno != 0: - raise TelnetLinesError("insert telnet lines error", errno) - -def taos_insert_json_payload(connection, payload): - # type: (c_void_p, list[str] | tuple(str)) -> None - payload = payload.encode("utf-8") - errno = _libtaos.taos_insert_json_payload(connection, payload) - if errno != 0: - raise JsonPayloadError("insert json payload error", errno) + raise SchemalessError("schemaless insert error", errno) class CTaosInterface(object): def __init__(self, config=None): diff --git a/src/connector/python/taos/connection.py b/src/connector/python/taos/connection.py index 35aca1fb26c1e612c3b3f6b1d8c794495bed0035..65ed89a85d3cc1c5ecab109abfb50aca3b1fec9c 100644 --- a/src/connector/python/taos/connection.py +++ b/src/connector/python/taos/connection.py @@ -117,9 +117,10 @@ class TaosConnection(object): stream = taos_open_stream(self._conn, sql, callback, stime, param, callback2) return TaosStream(stream) - def insert_lines(self, lines): + def schemaless_insert(self, lines, protocol): # type: (list[str]) -> None - """Line protocol and schemaless support + """ + 1.Line protocol and schemaless support ## Example @@ -131,34 +132,31 @@ class TaosConnection(object): lines = [ 'ste,t2=5,t3=L"ste" c1=true,c2=4,c3="string" 1626056811855516532', ] - conn.insert_lines(lines) + conn.schemaless_insert(lines, 0) ``` - ## Exception - - ```python - try: - conn.insert_lines(lines) - except SchemalessError as err: - print(err) - ``` - """ - return taos_insert_lines(self._conn, lines) - - def insert_telnet_lines(self, lines): - """OpenTSDB telnet style API format support + 2.OpenTSDB telnet style API format support ## Example - cpu_load 1626056811855516532ns 2.0f32 id="tb1",host="host0",interface="eth0" + import taos + conn = taos.connect() + conn.exec("drop database if exists test") + conn.select_db("test") + lines = [ + 'cpu_load 1626056811855516532ns 2.0f32 id="tb1",host="host0",interface="eth0"', + ] + conn.schemaless_insert(lines, 1) - """ - return taos_insert_telnet_lines(self._conn, lines) - def insert_json_payload(self, payload): - """OpenTSDB HTTP JSON format support + 3.OpenTSDB HTTP JSON format support ## Example - "{ + import taos + conn = taos.connect() + conn.exec("drop database if exists test") + conn.select_db("test") + payload = [''' + { "metric": "cpu_load_0", "timestamp": 1626006833610123, "value": 55.5, @@ -168,10 +166,13 @@ class TaosConnection(object): "interface": "eth0", "Id": "tb0" } - }" + } + '''] + conn.schemaless_insert(lines, 2) """ - return taos_insert_json_payload(self._conn, payload) + return taos_schemaless_insert(self._conn, lines, protocol) + def cursor(self): # type: () -> TaosCursor diff --git a/src/connector/python/taos/error.py b/src/connector/python/taos/error.py index f6a9d41f56a3fb071080daaae3bdd840190b154d..3b18dae9b9240cbda3d13d2a28ddeaf6bf6b7416 100644 --- a/src/connector/python/taos/error.py +++ b/src/connector/python/taos/error.py @@ -80,17 +80,7 @@ class ResultError(DatabaseError): pass -class LinesError(DatabaseError): - """taos_insert_lines errors.""" - - pass - -class TelnetLinesError(DatabaseError): - """taos_insert_telnet_lines errors.""" - - pass - -class JsonPayloadError(DatabaseError): - """taos_insert_json_payload errors.""" +class SchemalessError(DatabaseError): + """taos_schemaless_insert errors.""" pass diff --git a/src/connector/python/tests/test_lines.py b/src/connector/python/tests/test_lines.py index bd9d2cdb39d6f4f2612581ce7284c057c456ef91..ceef25b0e65f02af0bdcbadcb7f59efe775cba5e 100644 --- a/src/connector/python/tests/test_lines.py +++ b/src/connector/python/tests/test_lines.py @@ -13,10 +13,10 @@ def conn(): return connect() -def test_insert_lines(conn): +def test_schemaless_insert(conn): # type: (TaosConnection) -> None - dbname = "pytest_taos_insert_lines" + dbname = "pytest_taos_schemaless_insert" try: conn.execute("drop database if exists %s" % dbname) conn.execute("create database if not exists %s precision 'us'" % dbname) @@ -27,13 +27,13 @@ def test_insert_lines(conn): 'st,t1=4i64,t3="t4",t2=5f64,t4=5f64 c1=3i64,c3=L"passitagin",c2=true,c4=5f64,c5=5f64,c6=7u64 1626006933640000000ns', 'stf,t1=4i64,t3="t4",t2=5f64,t4=5f64 c1=3i64,c3=L"passitagin_stf",c2=false,c5=5f64,c6=7u64 1626006933641000000ns', ] - conn.insert_lines(lines) + conn.schemaless_insert(lines, 0) print("inserted") lines = [ 'stf,t1=5i64,t3="t4",t2=5f64,t4=5f64 c1=3i64,c3=L"passitagin_stf",c2=false,c5=5f64,c6=7u64 1626006933641000000ns', ] - conn.insert_lines(lines) + conn.schemaless_insert(lines, 0) print("inserted") result = conn.query("select * from st") print(*result.fields) @@ -54,4 +54,4 @@ def test_insert_lines(conn): if __name__ == "__main__": - test_insert_lines(connect()) + test_schemaless_insert(connect()) diff --git a/src/inc/taos.h b/src/inc/taos.h index be5123797069696ffad817c0db7bc2c8c03e9606..74eaae2120509cd544e53fd124d703c3687acb01 100644 --- a/src/inc/taos.h +++ b/src/inc/taos.h @@ -187,11 +187,7 @@ DLL_EXPORT void taos_close_stream(TAOS_STREAM *tstr); DLL_EXPORT int taos_load_table_info(TAOS *taos, const char* tableNameList); -DLL_EXPORT int taos_insert_lines(TAOS* taos, char* lines[], int numLines); - -DLL_EXPORT int taos_insert_telnet_lines(TAOS* taos, char* lines[], int numLines); - -DLL_EXPORT int taos_insert_json_payload(TAOS* taos, char* payload); +DLL_EXPORT int taos_schemaless_insert(TAOS* taos, char* lines[], int numLines, int protocol); #ifdef __cplusplus } diff --git a/src/inc/taoserror.h b/src/inc/taoserror.h index 887c51f10c5a6c10e213bb893725a837a0be77cd..6b62a123cac417031d27c5cf74a118f42d22150b 100644 --- a/src/inc/taoserror.h +++ b/src/inc/taoserror.h @@ -112,6 +112,7 @@ int32_t* taosGetErrno(); #define TSDB_CODE_TSC_INVALID_JSON_TYPE TAOS_DEF_ERROR_CODE(0, 0x0222) //"Invalid JSON data type") #define TSDB_CODE_TSC_INVALID_JSON_CONFIG TAOS_DEF_ERROR_CODE(0, 0x0223) //"Invalid JSON configuration") #define TSDB_CODE_TSC_VALUE_OUT_OF_RANGE TAOS_DEF_ERROR_CODE(0, 0x0224) //"Value out of range") +#define TSDB_CODE_TSC_INVALID_PROTOCOL_TYPE TAOS_DEF_ERROR_CODE(0, 0x0225) //"Invalid line protocol type") // mnode #define TSDB_CODE_MND_MSG_NOT_PROCESSED TAOS_DEF_ERROR_CODE(0, 0x0300) //"Message not processed") diff --git a/src/util/src/terror.c b/src/util/src/terror.c index 404d4ad0c18944826abebf6d0e73c573dbe54756..cb482aa8f151eab794965e14a2280cde22bd0852 100644 --- a/src/util/src/terror.c +++ b/src/util/src/terror.c @@ -120,6 +120,7 @@ TAOS_DEFINE_ERROR(TSDB_CODE_TSC_INVALID_JSON, "Invalid JSON format") TAOS_DEFINE_ERROR(TSDB_CODE_TSC_INVALID_JSON_TYPE, "Invalid JSON data type") TAOS_DEFINE_ERROR(TSDB_CODE_TSC_INVALID_JSON_CONFIG, "Invalid JSON configuration") TAOS_DEFINE_ERROR(TSDB_CODE_TSC_VALUE_OUT_OF_RANGE, "Value out of range") +TAOS_DEFINE_ERROR(TSDB_CODE_TSC_INVALID_PROTOCOL_TYPE, "Invalid line protocol type") // mnode TAOS_DEFINE_ERROR(TSDB_CODE_MND_MSG_NOT_PROCESSED, "Message not processed") diff --git a/tests/examples/c/apitest.c b/tests/examples/c/apitest.c index 18569196993de2c424f8449db3461b6ff0471d0d..e1d92abf852132a3f9ba549a236af65e4c81a730 100644 --- a/tests/examples/c/apitest.c +++ b/tests/examples/c/apitest.c @@ -980,40 +980,40 @@ int32_t verify_schema_less(TAOS* taos) { "stf,t1=4i64,t3=\"t4\",t2=5f64,t4=5f64 c1=3i64,c3=L\"passitagin_stf\",c2=false,c5=5f64,c6=7u64 1626006933641000000ns" }; - code = taos_insert_lines(taos, lines , sizeof(lines)/sizeof(char*)); + code = taos_schemaless_insert(taos, lines , sizeof(lines)/sizeof(char*), 0); char* lines2[] = { "stg,t1=3i64,t2=4f64,t3=\"t3\" c1=3i64,c3=L\"passit\",c2=false,c4=4f64 1626006833639000000ns", "stg,t1=4i64,t3=\"t4\",t2=5f64,t4=5f64 c1=3i64,c3=L\"passitagin\",c2=true,c4=5f64,c5=5f64 1626006833640000000ns" }; - code = taos_insert_lines(taos, &lines2[0], 1); - code = taos_insert_lines(taos, &lines2[1], 1); + code = taos_schemaless_insert(taos, &lines2[0], 1, 0); + code = taos_schemaless_insert(taos, &lines2[1], 1, 0); char* lines3[] = { "sth,t1=4i64,t2=5f64,t4=5f64,ID=\"childtable\" c1=3i64,c3=L\"passitagin_stf\",c2=false,c5=5f64,c6=7u64 1626006933641ms", "sth,t1=4i64,t2=5f64,t4=5f64 c1=3i64,c3=L\"passitagin_stf\",c2=false,c5=5f64,c6=7u64 1626006933654ms" }; - code = taos_insert_lines(taos, lines3, 2); + code = taos_schemaless_insert(taos, lines3, 2, 0); char* lines4[] = { "st123456,t1=3i64,t2=4f64,t3=\"t3\" c1=3i64,c3=L\"passit\",c2=false,c4=4f64 1626006833639000000ns", "dgtyqodr,t2=5f64,t3=L\"ste\" c1=tRue,c2=4i64,c3=\"iam\" 1626056811823316532ns" }; - code = taos_insert_lines(taos, lines4, 2); + code = taos_schemaless_insert(taos, lines4, 2, 0); char* lines5[] = { "zqlbgs,id=\"zqlbgs_39302_21680\",t0=f,t1=127i8,t2=32767i16,t3=2147483647i32,t4=9223372036854775807i64,t5=11.12345f32,t6=22.123456789f64,t7=\"binaryTagValue\",t8=L\"ncharTagValue\" c0=f,c1=127i8,c2=32767i16,c3=2147483647i32,c4=9223372036854775807i64,c5=11.12345f32,c6=22.123456789f64,c7=\"binaryColValue\",c8=L\"ncharColValue\",c9=7u64 1626006833639000000ns", "zqlbgs,t9=f,id=\"zqlbgs_39302_21680\",t0=f,t1=127i8,t11=127i8,t2=32767i16,t3=2147483647i32,t4=9223372036854775807i64,t5=11.12345f32,t6=22.123456789f64,t7=\"binaryTagValue\",t8=L\"ncharTagValue\",t10=L\"ncharTagValue\" c10=f,c0=f,c1=127i8,c12=127i8,c2=32767i16,c3=2147483647i32,c4=9223372036854775807i64,c5=11.12345f32,c6=22.123456789f64,c7=\"binaryColValue\",c8=L\"ncharColValue\",c9=7u64,c11=L\"ncharColValue\" 1626006833639000000ns" }; - code = taos_insert_lines(taos, &lines5[0], 1); - code = taos_insert_lines(taos, &lines5[1], 1); + code = taos_schemaless_insert(taos, &lines5[0], 1, 0); + code = taos_schemaless_insert(taos, &lines5[1], 1, 0); char* lines6[] = { "st123456,t1=3i64,t2=4f64,t3=\"t3\" c1=3i64,c3=L\"passit\",c2=false,c4=4f64 1626006833639000000ns", "dgtyqodr,t2=5f64,t3=L\"ste\" c1=tRue,c2=4i64,c3=\"iam\" 1626056811823316532ns" }; - code = taos_insert_lines(taos, lines6, 2); + code = taos_schemaless_insert(taos, lines6, 2, 0); return (code); } diff --git a/tests/examples/c/schemaless.c b/tests/examples/c/schemaless.c index 1a551cc5f7bd600ccaf87701953f7109743e8302..a84f97543b06d69820c1b18d630bb38d9d259755 100644 --- a/tests/examples/c/schemaless.c +++ b/tests/examples/c/schemaless.c @@ -77,9 +77,9 @@ int main(int argc, char* argv[]) { } //shuffle(lines, numSuperTables * numChildTables * numRowsPerChildTable); - printf("%s\n", "begin taos_insert_lines"); + printf("%s\n", "begin taos_schemaless_insert"); int64_t begin = getTimeInUs(); - int32_t code = taos_insert_lines(taos, lines, numSuperTables * numChildTables * numRowsPerChildTable); + int32_t code = taos_schemaless_insert(taos, lines, numSuperTables * numChildTables * numRowsPerChildTable, 0); int64_t end = getTimeInUs(); printf("code: %d, %s. time used: %"PRId64"\n", code, tstrerror(code), end-begin); diff --git a/tests/pytest/insert/insertJSONPayload.py b/tests/pytest/insert/insertJSONPayload.py index 88b03cf3f526a380a97acf2a45b86a2c64b66069..16a660db793fcd0e82e3af9cd103e4f5a401c3ef 100644 --- a/tests/pytest/insert/insertJSONPayload.py +++ b/tests/pytest/insert/insertJSONPayload.py @@ -33,7 +33,7 @@ class TDTestCase: ### Default format ### ### metric ### print("============= step0 : test metric ================") - payload = ''' + payload = [''' { "metric": ".stb.0.", "timestamp": 1626006833610123, @@ -45,16 +45,16 @@ class TDTestCase: "t4": "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>" } } - ''' - code = self._conn.insert_json_payload(payload) - print("insert_json_payload result {}".format(code)) + '''] + code = self._conn.schemaless_insert(payload, 2) + print("schemaless_insert result {}".format(code)) tdSql.query("describe _stb_0_") tdSql.checkRows(6) ### metric value ### print("============= step1 : test metric value types ================") - payload = ''' + payload = [''' { "metric": "stb0_0", "timestamp": 1626006833610123, @@ -66,14 +66,14 @@ class TDTestCase: "t4": "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>" } } - ''' - code = self._conn.insert_json_payload(payload) - print("insert_json_payload result {}".format(code)) + '''] + code = self._conn.schemaless_insert(payload, 2) + print("schemaless_insert result {}".format(code)) tdSql.query("describe stb0_0") tdSql.checkData(1, 1, "BIGINT") - payload = ''' + payload = [''' { "metric": "stb0_1", "timestamp": 1626006833610123, @@ -85,14 +85,14 @@ class TDTestCase: "t4": "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>" } } - ''' - code = self._conn.insert_json_payload(payload) - print("insert_json_payload result {}".format(code)) + '''] + code = self._conn.schemaless_insert(payload, 2) + print("schemaless_insert result {}".format(code)) tdSql.query("describe stb0_1") tdSql.checkData(1, 1, "BOOL") - payload = ''' + payload = [''' { "metric": "stb0_2", "timestamp": 1626006833610123, @@ -104,14 +104,14 @@ class TDTestCase: "t4": "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>" } } - ''' - code = self._conn.insert_json_payload(payload) - print("insert_json_payload result {}".format(code)) + '''] + code = self._conn.schemaless_insert(payload, 2) + print("schemaless_insert result {}".format(code)) tdSql.query("describe stb0_2") tdSql.checkData(1, 1, "BOOL") - payload = ''' + payload = [''' { "metric": "stb0_3", "timestamp": 1626006833610123, @@ -123,14 +123,14 @@ class TDTestCase: "t4": "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>" } } - ''' - code = self._conn.insert_json_payload(payload) - print("insert_json_payload result {}".format(code)) + '''] + code = self._conn.schemaless_insert(payload, 2) + print("schemaless_insert result {}".format(code)) tdSql.query("describe stb0_3") tdSql.checkData(1, 1, "BINARY") - payload = ''' + payload = [''' { "metric": "stb0_4", "timestamp": 1626006833610123, @@ -142,14 +142,14 @@ class TDTestCase: "t4": "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>" } } - ''' - code = self._conn.insert_json_payload(payload) - print("insert_json_payload result {}".format(code)) + '''] + code = self._conn.schemaless_insert(payload, 2) + print("schemaless_insert result {}".format(code)) tdSql.query("describe stb0_4") tdSql.checkData(1, 1, "DOUBLE") - payload = ''' + payload = [''' { "metric": "stb0_5", "timestamp": 1626006833610123, @@ -161,9 +161,9 @@ class TDTestCase: "t4": "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>" } } - ''' - code = self._conn.insert_json_payload(payload) - print("insert_json_payload result {}".format(code)) + '''] + code = self._conn.schemaless_insert(payload, 2) + print("schemaless_insert result {}".format(code)) tdSql.query("describe stb0_5") tdSql.checkData(1, 1, "DOUBLE") @@ -171,7 +171,7 @@ class TDTestCase: print("============= step2 : test timestamp ================") ### timestamp 0 ### - payload = ''' + payload = [''' { "metric": "stb0_6", "timestamp": 0, @@ -183,37 +183,14 @@ class TDTestCase: "t4": "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>" } } - ''' - code = self._conn.insert_json_payload(payload) - print("insert_json_payload result {}".format(code)) + '''] + code = self._conn.schemaless_insert(payload, 2) + print("schemaless_insert result {}".format(code)) print("============= step3 : test tags ================") - ### ID ### - payload = ''' - { - "metric": "stb0_7", - "timestamp": 0, - "value": 123, - "tags": { - "ID": "tb0_7", - "t1": true, - "iD": "tb000", - "t2": false, - "t3": 10, - "t4": "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>", - "id": "tb555" - } - } - ''' - code = self._conn.insert_json_payload(payload) - print("insert_json_payload result {}".format(code)) - - tdSql.query("select tbname from stb0_7") - tdSql.checkData(0, 0, "tb0_7") - ### Default tag numeric types ### - payload = ''' + payload = [''' { "metric": "stb0_8", "timestamp": 0, @@ -222,14 +199,14 @@ class TDTestCase: "t1": 123 } } - ''' - code = self._conn.insert_json_payload(payload) - print("insert_json_payload result {}".format(code)) + '''] + code = self._conn.schemaless_insert(payload, 2) + print("schemaless_insert result {}".format(code)) tdSql.query("describe stb0_8") tdSql.checkData(2, 1, "BIGINT") - payload = ''' + payload = [''' { "metric": "stb0_9", "timestamp": 0, @@ -238,14 +215,14 @@ class TDTestCase: "t1": 123.00 } } - ''' - code = self._conn.insert_json_payload(payload) - print("insert_json_payload result {}".format(code)) + '''] + code = self._conn.schemaless_insert(payload, 2) + print("schemaless_insert result {}".format(code)) tdSql.query("describe stb0_9") tdSql.checkData(2, 1, "DOUBLE") - payload = ''' + payload = [''' { "metric": "stb0_10", "timestamp": 0, @@ -254,9 +231,9 @@ class TDTestCase: "t1": 123E-1 } } - ''' - code = self._conn.insert_json_payload(payload) - print("insert_json_payload result {}".format(code)) + '''] + code = self._conn.schemaless_insert(payload, 2) + print("schemaless_insert result {}".format(code)) tdSql.query("describe stb0_10") tdSql.checkData(2, 1, "DOUBLE") @@ -265,7 +242,7 @@ class TDTestCase: print("============= step4 : test nested format ================") ### timestamp ### #seconds - payload = ''' + payload = [''' { "metric": "stb1_0", "timestamp": { @@ -280,15 +257,15 @@ class TDTestCase: "t4": "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>" } } - ''' - code = self._conn.insert_json_payload(payload) - print("insert_json_payload result {}".format(code)) + '''] + code = self._conn.schemaless_insert(payload, 2) + print("schemaless_insert result {}".format(code)) tdSql.query("select ts from stb1_0") tdSql.checkData(0, 0, "2021-07-11 20:33:53.000000") #milliseconds - payload = ''' + payload = [''' { "metric": "stb1_1", "timestamp": { @@ -303,15 +280,15 @@ class TDTestCase: "t4": "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>" } } - ''' - code = self._conn.insert_json_payload(payload) - print("insert_json_payload result {}".format(code)) + '''] + code = self._conn.schemaless_insert(payload, 2) + print("schemaless_insert result {}".format(code)) tdSql.query("select ts from stb1_1") tdSql.checkData(0, 0, "2021-07-11 20:33:53.610000") #microseconds - payload = ''' + payload = [''' { "metric": "stb1_2", "timestamp": { @@ -326,19 +303,19 @@ class TDTestCase: "t4": "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>" } } - ''' - code = self._conn.insert_json_payload(payload) - print("insert_json_payload result {}".format(code)) + '''] + code = self._conn.schemaless_insert(payload, 2) + print("schemaless_insert result {}".format(code)) tdSql.query("select ts from stb1_2") tdSql.checkData(0, 0, "2021-07-11 20:33:53.610123") #nanoseconds - payload = ''' + payload = [''' { "metric": "stb1_3", "timestamp": { - "value": 1.6260068336101233e+18, + "value": 1626006833610123321, "type": "ns" }, "value": 10, @@ -349,16 +326,16 @@ class TDTestCase: "t4": "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>" } } - ''' - code = self._conn.insert_json_payload(payload) - print("insert_json_payload result {}".format(code)) + '''] + code = self._conn.schemaless_insert(payload, 2) + print("schemaless_insert result {}".format(code)) tdSql.query("select ts from stb1_3") tdSql.checkData(0, 0, "2021-07-11 20:33:53.610123") #now tdSql.execute('use test') - payload = ''' + payload = [''' { "metric": "stb1_4", "timestamp": { @@ -373,12 +350,12 @@ class TDTestCase: "t4": "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>" } } - ''' - code = self._conn.insert_json_payload(payload) - print("insert_json_payload result {}".format(code)) + '''] + code = self._conn.schemaless_insert(payload, 2) + print("schemaless_insert result {}".format(code)) ### metric value ### - payload = ''' + payload = [''' { "metric": "stb2_0", "timestamp": { @@ -396,14 +373,14 @@ class TDTestCase: "t4": "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>" } } - ''' - code = self._conn.insert_json_payload(payload) - print("insert_json_payload result {}".format(code)) + '''] + code = self._conn.schemaless_insert(payload, 2) + print("schemaless_insert result {}".format(code)) tdSql.query("describe stb2_0") tdSql.checkData(1, 1, "BOOL") - payload = ''' + payload = [''' { "metric": "stb2_1", "timestamp": { @@ -421,14 +398,14 @@ class TDTestCase: "t4": "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>" } } - ''' - code = self._conn.insert_json_payload(payload) - print("insert_json_payload result {}".format(code)) + '''] + code = self._conn.schemaless_insert(payload, 2) + print("schemaless_insert result {}".format(code)) tdSql.query("describe stb2_1") tdSql.checkData(1, 1, "TINYINT") - payload = ''' + payload = [''' { "metric": "stb2_2", "timestamp": { @@ -446,14 +423,14 @@ class TDTestCase: "t4": "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>" } } - ''' - code = self._conn.insert_json_payload(payload) - print("insert_json_payload result {}".format(code)) + '''] + code = self._conn.schemaless_insert(payload, 2) + print("schemaless_insert result {}".format(code)) tdSql.query("describe stb2_2") tdSql.checkData(1, 1, "SMALLINT") - payload = ''' + payload = [''' { "metric": "stb2_3", "timestamp": { @@ -471,14 +448,14 @@ class TDTestCase: "t4": "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>" } } - ''' - code = self._conn.insert_json_payload(payload) - print("insert_json_payload result {}".format(code)) + '''] + code = self._conn.schemaless_insert(payload, 2) + print("schemaless_insert result {}".format(code)) tdSql.query("describe stb2_3") tdSql.checkData(1, 1, "INT") - payload = ''' + payload = [''' { "metric": "stb2_4", "timestamp": { @@ -496,14 +473,14 @@ class TDTestCase: "t4": "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>" } } - ''' - code = self._conn.insert_json_payload(payload) - print("insert_json_payload result {}".format(code)) + '''] + code = self._conn.schemaless_insert(payload, 2) + print("schemaless_insert result {}".format(code)) tdSql.query("describe stb2_4") tdSql.checkData(1, 1, "BIGINT") - payload = ''' + payload = [''' { "metric": "stb2_5", "timestamp": { @@ -521,14 +498,14 @@ class TDTestCase: "t4": "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>" } } - ''' - code = self._conn.insert_json_payload(payload) - print("insert_json_payload result {}".format(code)) + '''] + code = self._conn.schemaless_insert(payload, 2) + print("schemaless_insert result {}".format(code)) tdSql.query("describe stb2_5") tdSql.checkData(1, 1, "FLOAT") - payload = ''' + payload = [''' { "metric": "stb2_6", "timestamp": { @@ -546,14 +523,14 @@ class TDTestCase: "t4": "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>" } } - ''' - code = self._conn.insert_json_payload(payload) - print("insert_json_payload result {}".format(code)) + '''] + code = self._conn.schemaless_insert(payload, 2) + print("schemaless_insert result {}".format(code)) tdSql.query("describe stb2_6") tdSql.checkData(1, 1, "DOUBLE") - payload = ''' + payload = [''' { "metric": "stb2_7", "timestamp": { @@ -571,14 +548,14 @@ class TDTestCase: "t4": "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>" } } - ''' - code = self._conn.insert_json_payload(payload) - print("insert_json_payload result {}".format(code)) + '''] + code = self._conn.schemaless_insert(payload, 2) + print("schemaless_insert result {}".format(code)) tdSql.query("describe stb2_7") tdSql.checkData(1, 1, "BINARY") - payload = ''' + payload = [''' { "metric": "stb2_8", "timestamp": { @@ -596,16 +573,16 @@ class TDTestCase: "t4": "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>" } } - ''' - code = self._conn.insert_json_payload(payload) - print("insert_json_payload result {}".format(code)) + '''] + code = self._conn.schemaless_insert(payload, 2) + print("schemaless_insert result {}".format(code)) tdSql.query("describe stb2_8") tdSql.checkData(1, 1, "NCHAR") ### tag value ### - payload = ''' + payload = [''' { "metric": "stb3_0", "timestamp": { @@ -655,9 +632,9 @@ class TDTestCase: } } } - ''' - code = self._conn.insert_json_payload(payload) - print("insert_json_payload result {}".format(code)) + '''] + code = self._conn.schemaless_insert(payload, 2) + print("schemaless_insert result {}".format(code)) tdSql.query("describe stb3_0") tdSql.checkData(2, 1, "BOOL") diff --git a/tests/pytest/insert/insertTelnetLines.py b/tests/pytest/insert/insertTelnetLines.py index b47a74249bbad57ef758e886c513a7eea78b7634..348ff800c45dac0930ff41cfea533b8d15b0d976 100644 --- a/tests/pytest/insert/insertTelnetLines.py +++ b/tests/pytest/insert/insertTelnetLines.py @@ -39,8 +39,8 @@ class TDTestCase: ".stb0.3. 1626006833639000000ns 4i8 host=\"host0\" interface=\"eth0\"", ] - code = self._conn.insert_telnet_lines(lines0) - print("insert_telnet_lines result {}".format(code)) + code = self._conn.schemaless_insert(lines0, 1) + print("schemaless_insert result {}".format(code)) tdSql.query("show stables") tdSql.checkRows(4) @@ -68,8 +68,8 @@ class TDTestCase: "stb1 0 6i8 host=\"host0\"", ] - code = self._conn.insert_telnet_lines(lines1) - print("insert_telnet_lines result {}".format(code)) + code = self._conn.schemaless_insert(lines1, 1) + print("schemaless_insert result {}".format(code)) tdSql.query("select * from stb1") tdSql.checkRows(6) @@ -82,8 +82,8 @@ class TDTestCase: "stb2_0 1626006833651ms -127i8 host=\"host0\"", "stb2_0 1626006833652ms 127i8 host=\"host0\"" ] - code = self._conn.insert_telnet_lines(lines2_0) - print("insert_telnet_lines result {}".format(code)) + code = self._conn.schemaless_insert(lines2_0, 1) + print("schemaless_insert result {}".format(code)) tdSql.query("select * from stb2_0") tdSql.checkRows(2) @@ -97,8 +97,8 @@ class TDTestCase: "stb2_1 1626006833651ms -32767i16 host=\"host0\"", "stb2_1 1626006833652ms 32767i16 host=\"host0\"" ] - code = self._conn.insert_telnet_lines(lines2_1) - print("insert_telnet_lines result {}".format(code)) + code = self._conn.schemaless_insert(lines2_1, 1) + print("schemaless_insert result {}".format(code)) tdSql.query("select * from stb2_1") tdSql.checkRows(2) @@ -113,8 +113,8 @@ class TDTestCase: "stb2_2 1626006833652ms 2147483647i32 host=\"host0\"" ] - code = self._conn.insert_telnet_lines(lines2_2) - print("insert_telnet_lines result {}".format(code)) + code = self._conn.schemaless_insert(lines2_2, 1) + print("schemaless_insert result {}".format(code)) tdSql.query("select * from stb2_2") tdSql.checkRows(2) @@ -130,8 +130,8 @@ class TDTestCase: "stb2_3 1626006833662ms 9223372036854775807 host=\"host0\"" ] - code = self._conn.insert_telnet_lines(lines2_3) - print("insert_telnet_lines result {}".format(code)) + code = self._conn.schemaless_insert(lines2_3, 1) + print("schemaless_insert result {}".format(code)) tdSql.query("select * from stb2_3") tdSql.checkRows(3) @@ -154,8 +154,8 @@ class TDTestCase: "stb2_4 1626006833710ms -3.4E38f32 host=\"host0\"" ] - code = self._conn.insert_telnet_lines(lines2_4) - print("insert_telnet_lines result {}".format(code)) + code = self._conn.schemaless_insert(lines2_4, 1) + print("schemaless_insert result {}".format(code)) tdSql.query("select * from stb2_4") tdSql.checkRows(10) @@ -179,8 +179,8 @@ class TDTestCase: "stb2_5 1626006833710ms 3.15 host=\"host0\"" ] - code = self._conn.insert_telnet_lines(lines2_5) - print("insert_telnet_lines result {}".format(code)) + code = self._conn.schemaless_insert(lines2_5, 1) + print("schemaless_insert result {}".format(code)) tdSql.query("select * from stb2_5") tdSql.checkRows(11) @@ -203,8 +203,8 @@ class TDTestCase: "stb2_6 1626006833700ms FALSE host=\"host0\"" ] - code = self._conn.insert_telnet_lines(lines2_6) - print("insert_telnet_lines result {}".format(code)) + code = self._conn.schemaless_insert(lines2_6, 1) + print("schemaless_insert result {}".format(code)) tdSql.query("select * from stb2_6") tdSql.checkRows(10) @@ -220,8 +220,8 @@ class TDTestCase: "stb2_7 1626006833630ms \"binary_val.()[]{}<>\" host=\"host0\"" ] - code = self._conn.insert_telnet_lines(lines2_7) - print("insert_telnet_lines result {}".format(code)) + code = self._conn.schemaless_insert(lines2_7, 1) + print("schemaless_insert result {}".format(code)) tdSql.query("select * from stb2_7") tdSql.checkRows(3) @@ -236,8 +236,8 @@ class TDTestCase: "stb2_8 1626006833620ms L\"nchar_val数值二\" host=\"host0\"" ] - code = self._conn.insert_telnet_lines(lines2_8) - print("insert_telnet_lines result {}".format(code)) + code = self._conn.schemaless_insert(lines2_8, 1) + print("schemaless_insert result {}".format(code)) tdSql.query("select * from stb2_8") tdSql.checkRows(2) @@ -254,8 +254,8 @@ class TDTestCase: "stb3_0 1626006833610ms 2 t1=-127i8 t2=-32767i16 t3=-2147483647i32 t4=-9223372036854775807i64 t5=-3.4E38f32 t6=-1.7E308f64 t7=false t8=\"binary_val_2\" t9=L\"标签值2\"" ] - code = self._conn.insert_telnet_lines(lines3_0) - print("insert_telnet_lines result {}".format(code)) + code = self._conn.schemaless_insert(lines3_0, 1) + print("schemaless_insert result {}".format(code)) tdSql.query("select * from stb3_0") tdSql.checkRows(2) @@ -298,8 +298,8 @@ class TDTestCase: "stb3_1 1626006833610ms 3 ID=\"child_table3\" host=\"host3\"" ] - code = self._conn.insert_telnet_lines(lines3_1) - print("insert_telnet_lines result {}".format(code)) + code = self._conn.schemaless_insert(lines3_1, 1) + print("schemaless_insert result {}".format(code)) tdSql.query("select * from stb3_1") tdSql.checkRows(3) diff --git a/tests/pytest/insert/line_insert.py b/tests/pytest/insert/line_insert.py index 92fdd0f28e612994df414ea1b560152a3f2001a8..766142604a19732247833909b8e40af4fea95cb7 100644 --- a/tests/pytest/insert/line_insert.py +++ b/tests/pytest/insert/line_insert.py @@ -42,18 +42,18 @@ class TDTestCase: "stf,t1=4i64,t3=\"t4\",t2=5f64,t4=5f64 c1=3i64,c3=L\"passitagin_stf\",c2=false,c5=5f64,c6=7u64 1626006933641000000ns" ] - code = self._conn.insert_lines(lines) - print("insert_lines result {}".format(code)) + code = self._conn.schemaless_insert(lines, 0) + print("schemaless_insert result {}".format(code)) lines2 = [ "stg,t1=3i64,t2=4f64,t3=\"t3\" c1=3i64,c3=L\"passit\",c2=false,c4=4f64 1626006833639000000ns", "stg,t1=4i64,t3=\"t4\",t2=5f64,t4=5f64 c1=3i64,c3=L\"passitagin\",c2=true,c4=5f64,c5=5f64 1626006833640000000ns" ] - - code = self._conn.insert_lines([ lines2[0] ]) - print("insert_lines result {}".format(code)) - self._conn.insert_lines([ lines2[1] ]) - print("insert_lines result {}".format(code)) + code = self._conn.schemaless_insert([ lines2[0] ], 0) + print("schemaless_insert result {}".format(code)) + + self._conn.schemaless_insert([ lines2[1] ], 0) + print("schemaless_insert result {}".format(code)) tdSql.query("select * from st") tdSql.checkRows(4) @@ -73,10 +73,10 @@ class TDTestCase: tdSql.query("describe stf") tdSql.checkData(2, 2, 14) - self._conn.insert_lines([ + self._conn.schemaless_insert([ "sth,t1=4i64,t2=5f64,t4=5f64,ID=\"childtable\" c1=3i64,c3=L\"passitagin_stf\",c2=false,c5=5f64,c6=7u64 1626006933641ms", - "sth,t1=4i64,t2=5f64,t4=5f64 c1=3i64,c3=L\"passitagin_stf\",c2=false,c5=5f64,c6=7u64 1626006933654ms" - ]) + "sth,t1=4i64,t2=5f64,t4=5f64 c1=3i64,c3=L\"passitagin_stf\",c2=false,c5=5f64,c6=7u64 1626006933654ms" + ], 0) tdSql.execute('reset query cache') tdSql.query('select tbname, * from sth') diff --git a/tests/pytest/insert/openTsdbTelnetLinesInsert.py b/tests/pytest/insert/openTsdbTelnetLinesInsert.py index 26d25941950602978334da0234aa40ce3d4a6c3b..c3524af5ba58d636a5f5810759aec507b648495b 100644 --- a/tests/pytest/insert/openTsdbTelnetLinesInsert.py +++ b/tests/pytest/insert/openTsdbTelnetLinesInsert.py @@ -13,7 +13,7 @@ import traceback import random -from taos.error import TelnetLinesError +from taos.error import SchemalessError import time import numpy as np from util.log import * @@ -282,7 +282,7 @@ class TDTestCase: def resCmp(self, input_sql, stb_name, query_sql="select * from", condition="", ts=None, id=True, none_check_tag=None): expect_list = self.inputHandle(input_sql) - self._conn.insert_telnet_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 1) query_sql = f"{query_sql} {stb_name} {condition}" res_row_list, res_field_list_without_ts, res_type_list = self.resHandle(query_sql, True) if ts == 0: @@ -389,13 +389,13 @@ class TDTestCase: """ for input_sql in [self.genLongSql(128)[0]]: tdCom.cleanTb() - self._conn.insert_telnet_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 1) for input_sql in [self.genLongSql(129)[0]]: tdCom.cleanTb() try: - self._conn.insert_telnet_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 1) raise Exception("should not reach here") - except TelnetLinesError as err: + except SchemalessError as err: tdSql.checkNotEqual(err.errno, 0) def idIllegalNameCheckCase(self): @@ -408,9 +408,9 @@ class TDTestCase: for i in rstr: input_sql = self.genFullTypeSql(tb_name=f"\"aaa{i}bbb\"")[0] try: - self._conn.insert_telnet_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 1) raise Exception("should not reach here") - except TelnetLinesError as err: + except SchemalessError as err: tdSql.checkNotEqual(err.errno, 0) def idStartWithNumCheckCase(self): @@ -420,9 +420,9 @@ class TDTestCase: tdCom.cleanTb() input_sql = self.genFullTypeSql(tb_name=f"\"1aaabbb\"")[0] try: - self._conn.insert_telnet_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 1) raise Exception("should not reach here") - except TelnetLinesError as err: + except SchemalessError as err: tdSql.checkNotEqual(err.errno, 0) def nowTsCheckCase(self): @@ -432,9 +432,9 @@ class TDTestCase: tdCom.cleanTb() input_sql = self.genFullTypeSql(ts="now")[0] try: - self._conn.insert_telnet_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 1) raise Exception("should not reach here") - except TelnetLinesError as err: + except SchemalessError as err: tdSql.checkNotEqual(err.errno, 0) def dateFormatTsCheckCase(self): @@ -444,9 +444,9 @@ class TDTestCase: tdCom.cleanTb() input_sql = self.genFullTypeSql(ts="2021-07-21\ 19:01:46.920")[0] try: - self._conn.insert_telnet_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 1) raise Exception("should not reach here") - except TelnetLinesError as err: + except SchemalessError as err: tdSql.checkNotEqual(err.errno, 0) def illegalTsCheckCase(self): @@ -456,9 +456,9 @@ class TDTestCase: tdCom.cleanTb() input_sql = self.genFullTypeSql(ts="16260068336390us19")[0] try: - self._conn.insert_telnet_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 1) raise Exception("should not reach here") - except TelnetLinesError as err: + except SchemalessError as err: tdSql.checkNotEqual(err.errno, 0) def tagValueLengthCheckCase(self): @@ -473,9 +473,9 @@ class TDTestCase: for t1 in ["-128i8", "128i8"]: input_sql = self.genFullTypeSql(t1=t1)[0] try: - self._conn.insert_telnet_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 1) raise Exception("should not reach here") - except TelnetLinesError as err: + except SchemalessError as err: tdSql.checkNotEqual(err.errno, 0) #i16 @@ -485,9 +485,9 @@ class TDTestCase: for t2 in ["-32768i16", "32768i16"]: input_sql = self.genFullTypeSql(t2=t2)[0] try: - self._conn.insert_telnet_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 1) raise Exception("should not reach here") - except TelnetLinesError as err: + except SchemalessError as err: tdSql.checkNotEqual(err.errno, 0) #i32 @@ -497,9 +497,9 @@ class TDTestCase: for t3 in ["-2147483648i32", "2147483648i32"]: input_sql = self.genFullTypeSql(t3=t3)[0] try: - self._conn.insert_telnet_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 1) raise Exception("should not reach here") - except TelnetLinesError as err: + except SchemalessError as err: tdSql.checkNotEqual(err.errno, 0) #i64 @@ -509,9 +509,9 @@ class TDTestCase: for t4 in ["-9223372036854775808i64", "9223372036854775808i64"]: input_sql = self.genFullTypeSql(t4=t4)[0] try: - self._conn.insert_telnet_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 1) raise Exception("should not reach here") - except TelnetLinesError as err: + except SchemalessError as err: tdSql.checkNotEqual(err.errno, 0) # f32 @@ -522,9 +522,9 @@ class TDTestCase: for t5 in [f"{-3.4028234664*(10**38)}f32", f"{3.4028234664*(10**38)}f32"]: input_sql = self.genFullTypeSql(t5=t5)[0] try: - self._conn.insert_telnet_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 1) raise Exception("should not reach here") - except TelnetLinesError as err: + except SchemalessError as err: tdSql.checkNotEqual(err.errno, 0) @@ -536,33 +536,33 @@ class TDTestCase: for t6 in [f'{-1.797693134862316*(10**308)}f64', f'{-1.797693134862316*(10**308)}f64']: input_sql = self.genFullTypeSql(t6=t6)[0] try: - self._conn.insert_telnet_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 1) raise Exception("should not reach here") - except TelnetLinesError as err: + except SchemalessError as err: tdSql.checkNotEqual(err.errno, 0) # binary stb_name = tdCom.getLongName(7, "letters") input_sql = f'{stb_name} 1626006833639000000ns t t0=t t1="{tdCom.getLongName(16374, "letters")}"' - self._conn.insert_telnet_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 1) input_sql = f'{stb_name} 1626006833639000000ns t t0=t t1="{tdCom.getLongName(16375, "letters")}"' try: - self._conn.insert_telnet_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 1) raise Exception("should not reach here") - except TelnetLinesError as err: + except SchemalessError as err: tdSql.checkNotEqual(err.errno, 0) # nchar # * legal nchar could not be larger than 16374/4 stb_name = tdCom.getLongName(7, "letters") input_sql = f'{stb_name} 1626006833639000000ns t t0=t t1=L"{tdCom.getLongName(4093, "letters")}"' - self._conn.insert_telnet_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 1) input_sql = f'{stb_name} 1626006833639000000ns t t0=t t1=L"{tdCom.getLongName(4094, "letters")}"' try: - self._conn.insert_telnet_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 1) raise Exception("should not reach here") - except TelnetLinesError as err: + except SchemalessError as err: tdSql.checkNotEqual(err.errno, 0) def colValueLengthCheckCase(self): @@ -578,9 +578,9 @@ class TDTestCase: for value in ["-128i8", "128i8"]: input_sql = self.genFullTypeSql(value=value)[0] try: - self._conn.insert_telnet_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 1) raise Exception("should not reach here") - except TelnetLinesError as err: + except SchemalessError as err: tdSql.checkNotEqual(err.errno, 0) # i16 tdCom.cleanTb() @@ -591,9 +591,9 @@ class TDTestCase: for value in ["-32768i16", "32768i16"]: input_sql = self.genFullTypeSql(value=value)[0] try: - self._conn.insert_telnet_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 1) raise Exception("should not reach here") - except TelnetLinesError as err: + except SchemalessError as err: tdSql.checkNotEqual(err.errno, 0) # i32 @@ -605,9 +605,9 @@ class TDTestCase: for value in ["-2147483648i32", "2147483648i32"]: input_sql = self.genFullTypeSql(value=value)[0] try: - self._conn.insert_telnet_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 1) raise Exception("should not reach here") - except TelnetLinesError as err: + except SchemalessError as err: tdSql.checkNotEqual(err.errno, 0) # i64 @@ -619,9 +619,9 @@ class TDTestCase: for value in ["-9223372036854775808i64", "9223372036854775808i64"]: input_sql = self.genFullTypeSql(value=value)[0] try: - self._conn.insert_telnet_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 1) raise Exception("should not reach here") - except TelnetLinesError as err: + except SchemalessError as err: tdSql.checkNotEqual(err.errno, 0) # f32 @@ -634,9 +634,9 @@ class TDTestCase: for value in [f"{-3.4028234664*(10**38)}f32", f"{3.4028234664*(10**38)}f32"]: input_sql = self.genFullTypeSql(value=value)[0] try: - self._conn.insert_telnet_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 1) raise Exception("should not reach here") - except TelnetLinesError as err: + except SchemalessError as err: tdSql.checkNotEqual(err.errno, 0) # f64 @@ -649,23 +649,23 @@ class TDTestCase: for value in [f'{-1.797693134862316*(10**308)}f64', f'{-1.797693134862316*(10**308)}f64']: input_sql = self.genFullTypeSql(value=value)[0] try: - self._conn.insert_telnet_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 1) raise Exception("should not reach here") - except TelnetLinesError as err: + except SchemalessError as err: tdSql.checkNotEqual(err.errno, 0) # # binary tdCom.cleanTb() stb_name = tdCom.getLongName(7, "letters") input_sql = f'{stb_name} 1626006833639000000ns "{tdCom.getLongName(16374, "letters")}" t0=t' - self._conn.insert_telnet_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 1) tdCom.cleanTb() input_sql = f'{stb_name} 1626006833639000000ns "{tdCom.getLongName(16375, "letters")}" t0=t' try: - self._conn.insert_telnet_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 1) raise Exception("should not reach here") - except TelnetLinesError as err: + except SchemalessError as err: tdSql.checkNotEqual(err.errno, 0) # nchar @@ -673,14 +673,14 @@ class TDTestCase: tdCom.cleanTb() stb_name = tdCom.getLongName(7, "letters") input_sql = f'{stb_name} 1626006833639000000ns L"{tdCom.getLongName(4093, "letters")}" t0=t' - self._conn.insert_telnet_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 1) tdCom.cleanTb() input_sql = f'{stb_name} 1626006833639000000ns L"{tdCom.getLongName(4094, "letters")}" t0=t' try: - self._conn.insert_telnet_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 1) raise Exception("should not reach here") - except TelnetLinesError as err: + except SchemalessError as err: tdSql.checkNotEqual(err.errno, 0) def tagColIllegalValueCheckCase(self): @@ -706,9 +706,9 @@ class TDTestCase: self.genFullTypeSql(t6="11.1s45f64")[0], ]: try: - self._conn.insert_telnet_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 1) raise Exception("should not reach here") - except TelnetLinesError as err: + except SchemalessError as err: tdSql.checkNotEqual(err.errno, 0) # check binary and nchar blank @@ -718,9 +718,9 @@ class TDTestCase: input_sql4 = f'{tdCom.getLongName(7, "letters")} 1626006833639000000ns t t0=L"abc aaa"' for input_sql in [input_sql1, input_sql2, input_sql3, input_sql4]: try: - self._conn.insert_telnet_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 1) raise Exception("should not reach here") - except TelnetLinesError as err: + except SchemalessError as err: tdSql.checkNotEqual(err.errno, 0) # check accepted binary and nchar symbols @@ -728,8 +728,8 @@ class TDTestCase: for symbol in list('~!@#$¥%^&*()-+={}|[]、「」:;'): input_sql1 = f'{tdCom.getLongName(7, "letters")} 1626006833639000000ns "abc{symbol}aaa" t0=t' input_sql2 = f'{tdCom.getLongName(7, "letters")} 1626006833639000000ns t t0=t t1="abc{symbol}aaa"' - self._conn.insert_telnet_lines([input_sql1]) - self._conn.insert_telnet_lines([input_sql2]) + self._conn.schemaless_insert([input_sql1], 1) + self._conn.schemaless_insert([input_sql2], 1) def blankCheckCase(self): ''' @@ -748,9 +748,9 @@ class TDTestCase: f'{tdCom.getLongName(7, "letters")} 1626006833639000000ns L"abaaa" t0=L"abcaaa3"'] for input_sql in input_sql_list: try: - self._conn.insert_telnet_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 1) raise Exception("should not reach here") - except TelnetLinesError as err: + except SchemalessError as err: tdSql.checkNotEqual(err.errno, 0) def duplicateIdTagColInsertCheckCase(self): @@ -760,17 +760,17 @@ class TDTestCase: tdCom.cleanTb() input_sql_id = self.genFullTypeSql(id_double_tag=True)[0] try: - self._conn.insert_telnet_lines([input_sql_id]) + self._conn.schemaless_insert([input_sql_id], 1) raise Exception("should not reach here") - except TelnetLinesError as err: + except SchemalessError as err: tdSql.checkNotEqual(err.errno, 0) input_sql = self.genFullTypeSql()[0] input_sql_tag = input_sql.replace("t5", "t6") try: - self._conn.insert_telnet_lines([input_sql_tag]) + self._conn.schemaless_insert([input_sql_tag], 1) raise Exception("should not reach here") - except TelnetLinesError as err: + except SchemalessError as err: tdSql.checkNotEqual(err.errno, 0) ##### stb exist ##### @@ -794,7 +794,7 @@ class TDTestCase: tdCom.cleanTb() input_sql, stb_name = self.genFullTypeSql() self.resCmp(input_sql, stb_name) - self._conn.insert_telnet_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 1) self.resCmp(input_sql, stb_name) def tagColBinaryNcharLengthCheckCase(self): @@ -865,7 +865,7 @@ class TDTestCase: tdSql.checkRows(1) tdSql.checkEqual(tb_name1, tb_name2) input_sql, stb_name = self.genFullTypeSql(stb_name=stb_name, t0="f", value="f", id_noexist_tag=True, t_add_tag=True) - self._conn.insert_telnet_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 1) tb_name3 = self.getNoIdTbName(stb_name) tdSql.query(f"select * from {stb_name}") tdSql.checkRows(2) @@ -881,19 +881,19 @@ class TDTestCase: tb_name = f'{stb_name}_1' input_sql = f'{stb_name} 1626006833639000000ns f id="{tb_name}" t0=t' - self._conn.insert_telnet_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 1) # * every binary and nchar must be length+2, so here is two tag, max length could not larger than 16384-2*2 input_sql = f'{stb_name} 1626006833639000000ns f t0=t t1="{tdCom.getLongName(16374, "letters")}" t2="{tdCom.getLongName(5, "letters")}"' - self._conn.insert_telnet_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 1) tdSql.query(f"select * from {stb_name}") tdSql.checkRows(2) input_sql = f'{stb_name} 1626006833639000000ns f t0=t t1="{tdCom.getLongName(16374, "letters")}" t2="{tdCom.getLongName(6, "letters")}"' try: - self._conn.insert_telnet_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 1) raise Exception("should not reach here") - except TelnetLinesError as err: + except SchemalessError as err: tdSql.checkNotEqual(err.errno, 0) tdSql.query(f"select * from {stb_name}") tdSql.checkRows(2) @@ -907,18 +907,18 @@ class TDTestCase: stb_name = tdCom.getLongName(7, "letters") tb_name = f'{stb_name}_1' input_sql = f'{stb_name} 1626006833639000000ns f id="{tb_name}" t0=t' - self._conn.insert_telnet_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 1) # * legal nchar could not be larger than 16374/4 input_sql = f'{stb_name} 1626006833639000000ns f t0=t t1=L"{tdCom.getLongName(4093, "letters")}" t2=L"{tdCom.getLongName(1, "letters")}"' - self._conn.insert_telnet_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 1) tdSql.query(f"select * from {stb_name}") tdSql.checkRows(2) input_sql = f'{stb_name} 1626006833639000000ns f t0=t t1=L"{tdCom.getLongName(4093, "letters")}" t2=L"{tdCom.getLongName(2, "letters")}"' try: - self._conn.insert_telnet_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 1) raise Exception("should not reach here") - except TelnetLinesError as err: + except SchemalessError as err: tdSql.checkNotEqual(err.errno, 0) tdSql.query(f"select * from {stb_name}") tdSql.checkRows(2) @@ -941,7 +941,7 @@ class TDTestCase: "st123456 1626006933640000000ns 8i64 t1=4i64 t3=\"t4\" t2=5f64 t4=5f64", "st123456 1626006933641000000ns 9i64 t1=4i64 t3=\"t4\" t2=5f64 t4=5f64" ] - self._conn.insert_telnet_lines(lines) + self._conn.schemaless_insert(lines, 1) tdSql.query('show stables') tdSql.checkRows(3) tdSql.query('show tables') @@ -960,7 +960,7 @@ class TDTestCase: for i in range(count): input_sql = self.genFullTypeSql(stb_name=stb_name, t7=f'"{tdCom.getLongName(8, "letters")}"', value=f'"{tdCom.getLongName(8, "letters")}"', id_noexist_tag=True)[0] sql_list.append(input_sql) - self._conn.insert_telnet_lines(sql_list) + self._conn.schemaless_insert(sql_list, 1) tdSql.query('show tables') tdSql.checkRows(count) @@ -973,9 +973,9 @@ class TDTestCase: lines = ["st123456 1626006833639000000ns 3i 64 t1=3i64 t2=4f64 t3=\"t3\"", f"{stb_name} 1626056811823316532ns tRue t2=5f64 t3=L\"ste\""] try: - self._conn.insert_telnet_lines(lines) + self._conn.schemaless_insert(lines, 1) raise Exception("should not reach here") - except TelnetLinesError as err: + except SchemalessError as err: tdSql.checkNotEqual(err.errno, 0) def multiColsInsertCheckCase(self): @@ -985,9 +985,9 @@ class TDTestCase: tdCom.cleanTb() input_sql = self.genFullTypeSql(t_multi_tag=True)[0] try: - self._conn.insert_telnet_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 1) raise Exception("should not reach here") - except TelnetLinesError as err: + except SchemalessError as err: tdSql.checkNotEqual(err.errno, 0) def blankColInsertCheckCase(self): @@ -997,9 +997,9 @@ class TDTestCase: tdCom.cleanTb() input_sql = self.genFullTypeSql(c_blank_tag=True)[0] try: - self._conn.insert_telnet_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 1) raise Exception("should not reach here") - except TelnetLinesError as err: + except SchemalessError as err: tdSql.checkNotEqual(err.errno, 0) def blankTagInsertCheckCase(self): @@ -1009,9 +1009,9 @@ class TDTestCase: tdCom.cleanTb() input_sql = self.genFullTypeSql(t_blank_tag=True)[0] try: - self._conn.insert_telnet_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 1) raise Exception("should not reach here") - except TelnetLinesError as err: + except SchemalessError as err: tdSql.checkNotEqual(err.errno, 0) def chineseCheckCase(self): @@ -1029,9 +1029,9 @@ class TDTestCase: tdCom.cleanTb() input_sql = self.genFullTypeSql(multi_field_tag=True)[0] try: - self._conn.insert_telnet_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 1) raise Exception("should not reach here") - except TelnetLinesError as err: + except SchemalessError as err: tdSql.checkNotEqual(err.errno, 0) def errorTypeCheckCase(self): @@ -1120,7 +1120,7 @@ class TDTestCase: def genMultiThreadSeq(self, sql_list): tlist = list() for insert_sql in sql_list: - t = threading.Thread(target=self._conn.insert_telnet_lines,args=([insert_sql[0]],)) + t = threading.Thread(target=self._conn.schemaless_insert,args=([insert_sql[0]],1)) tlist.append(t) return tlist @@ -1320,8 +1320,8 @@ class TDTestCase: def test(self): try: input_sql = f'test_nchar 0 L"涛思数据" t0=f t1=L"涛思数据" t2=32767i16 t3=2147483647i32 t4=9223372036854775807i64 t5=11.12345f32 t6=22.123456789f64' - self._conn.insert_telnet_lines([input_sql]) - except TelnetLinesError as err: + self._conn.schemaless_insert([input_sql], 1) + except SchemalessError as err: print(err.errno) def runAll(self): diff --git a/tests/pytest/insert/schemalessInsert.py b/tests/pytest/insert/schemalessInsert.py index 49c32235883483c9d709b6d7a41dc9419dd95461..391edd1a01776570d956b9e59c8e138a6e55b681 100644 --- a/tests/pytest/insert/schemalessInsert.py +++ b/tests/pytest/insert/schemalessInsert.py @@ -14,7 +14,7 @@ import traceback import random import string -from taos.error import LinesError +from taos.error import SchemalessError import time from copy import deepcopy import numpy as np @@ -294,7 +294,7 @@ class TDTestCase: def resCmp(self, input_sql, stb_name, query_sql="select * from", condition="", ts=None, id=True, none_check_tag=None): expect_list = self.inputHandle(input_sql) - self._conn.insert_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 0) query_sql = f"{query_sql} {stb_name} {condition}" res_row_list, res_field_list_without_ts, res_type_list = self.resHandle(query_sql, True) if ts == 0: @@ -409,12 +409,12 @@ class TDTestCase: """ for input_sql in [self.genLongSql(128, 1)[0], self.genLongSql(1, 4094)[0]]: self.cleanStb() - self._conn.insert_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 0) for input_sql in [self.genLongSql(129, 1)[0], self.genLongSql(1, 4095)[0]]: self.cleanStb() try: - self._conn.insert_lines([input_sql]) - except LinesError: + self._conn.schemaless_insert([input_sql], 0) + except SchemalessError: pass def idIllegalNameCheckCase(self): @@ -427,8 +427,8 @@ class TDTestCase: for i in rstr: input_sql = self.genFullTypeSql(tb_name=f"\"aaa{i}bbb\"")[0] try: - self._conn.insert_lines([input_sql]) - except LinesError: + self._conn.schemaless_insert([input_sql], 0) + except SchemalessError: pass def idStartWithNumCheckCase(self): @@ -438,8 +438,8 @@ class TDTestCase: self.cleanStb() input_sql = self.genFullTypeSql(tb_name=f"\"1aaabbb\"")[0] try: - self._conn.insert_lines([input_sql]) - except LinesError: + self._conn.schemaless_insert([input_sql], 0) + except SchemalessError: pass def nowTsCheckCase(self): @@ -449,8 +449,8 @@ class TDTestCase: self.cleanStb() input_sql = self.genFullTypeSql(ts="now")[0] try: - self._conn.insert_lines([input_sql]) - except LinesError: + self._conn.schemaless_insert([input_sql], 0) + except SchemalessError: pass def dateFormatTsCheckCase(self): @@ -460,8 +460,8 @@ class TDTestCase: self.cleanStb() input_sql = self.genFullTypeSql(ts="2021-07-21\ 19:01:46.920")[0] try: - self._conn.insert_lines([input_sql]) - except LinesError: + self._conn.schemaless_insert([input_sql], 0) + except SchemalessError: pass def illegalTsCheckCase(self): @@ -471,8 +471,8 @@ class TDTestCase: self.cleanStb() input_sql = self.genFullTypeSql(ts="16260068336390us19")[0] try: - self._conn.insert_lines([input_sql]) - except LinesError: + self._conn.schemaless_insert([input_sql], 0) + except SchemalessError: pass def tagValueLengthCheckCase(self): @@ -487,8 +487,8 @@ class TDTestCase: for t1 in ["-128i8", "128i8"]: input_sql = self.genFullTypeSql(t1=t1)[0] try: - self._conn.insert_lines([input_sql]) - except LinesError: + self._conn.schemaless_insert([input_sql], 0) + except SchemalessError: pass #i16 @@ -498,8 +498,8 @@ class TDTestCase: for t2 in ["-32768i16", "32768i16"]: input_sql = self.genFullTypeSql(t2=t2)[0] try: - self._conn.insert_lines([input_sql]) - except LinesError: + self._conn.schemaless_insert([input_sql], 0) + except SchemalessError: pass #i32 @@ -509,8 +509,8 @@ class TDTestCase: for t3 in ["-2147483648i32", "2147483648i32"]: input_sql = self.genFullTypeSql(t3=t3)[0] try: - self._conn.insert_lines([input_sql]) - except LinesError: + self._conn.schemaless_insert([input_sql], 0) + except SchemalessError: pass #i64 @@ -520,8 +520,8 @@ class TDTestCase: for t4 in ["-9223372036854775808i64", "9223372036854775808i64"]: input_sql = self.genFullTypeSql(t4=t4)[0] try: - self._conn.insert_lines([input_sql]) - except LinesError: + self._conn.schemaless_insert([input_sql], 0) + except SchemalessError: pass # f32 @@ -532,9 +532,9 @@ class TDTestCase: for t5 in [f"{-3.4028234664*(10**38)}f32", f"{3.4028234664*(10**38)}f32"]: input_sql = self.genFullTypeSql(t5=t5)[0] try: - self._conn.insert_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 0) raise Exception("should not reach here") - except LinesError as err: + except SchemalessError as err: tdSql.checkNotEqual(err.errno, 0) @@ -546,34 +546,34 @@ class TDTestCase: for c6 in [f'{-1.797693134862316*(10**308)}f64', f'{-1.797693134862316*(10**308)}f64']: input_sql = self.genFullTypeSql(c6=c6)[0] try: - self._conn.insert_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 0) raise Exception("should not reach here") - except LinesError as err: + except SchemalessError as err: tdSql.checkNotEqual(err.errno, 0) # binary stb_name = self.getLongName(7, "letters") input_sql = f'{stb_name},t0=t,t1="{self.getLongName(16374, "letters")}" c0=f 1626006833639000000ns' - self._conn.insert_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 0) input_sql = f'{stb_name},t0=t,t1="{self.getLongName(16375, "letters")}" c0=f 1626006833639000000ns' try: - self._conn.insert_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 0) raise Exception("should not reach here") - except LinesError as err: + except SchemalessError as err: pass # nchar # * legal nchar could not be larger than 16374/4 stb_name = self.getLongName(7, "letters") input_sql = f'{stb_name},t0=t,t1=L"{self.getLongName(4093, "letters")}" c0=f 1626006833639000000ns' - self._conn.insert_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 0) input_sql = f'{stb_name},t0=t,t1=L"{self.getLongName(4094, "letters")}" c0=f 1626006833639000000ns' try: - self._conn.insert_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 0) raise Exception("should not reach here") - except LinesError as err: + except SchemalessError as err: tdSql.checkNotEqual(err.errno, 0) def colValueLengthCheckCase(self): @@ -589,9 +589,9 @@ class TDTestCase: for c1 in ["-128i8", "128i8"]: input_sql = self.genFullTypeSql(c1=c1)[0] try: - self._conn.insert_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 0) raise Exception("should not reach here") - except LinesError as err: + except SchemalessError as err: tdSql.checkNotEqual(err.errno, 0) # i16 for c2 in ["-32767i16"]: @@ -600,9 +600,9 @@ class TDTestCase: for c2 in ["-32768i16", "32768i16"]: input_sql = self.genFullTypeSql(c2=c2)[0] try: - self._conn.insert_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 0) raise Exception("should not reach here") - except LinesError as err: + except SchemalessError as err: tdSql.checkNotEqual(err.errno, 0) # i32 @@ -612,9 +612,9 @@ class TDTestCase: for c3 in ["-2147483648i32", "2147483648i32"]: input_sql = self.genFullTypeSql(c3=c3)[0] try: - self._conn.insert_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 0) raise Exception("should not reach here") - except LinesError as err: + except SchemalessError as err: tdSql.checkNotEqual(err.errno, 0) # i64 @@ -624,9 +624,9 @@ class TDTestCase: for c4 in ["-9223372036854775808i64", "9223372036854775808i64"]: input_sql = self.genFullTypeSql(c4=c4)[0] try: - self._conn.insert_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 0) raise Exception("should not reach here") - except LinesError as err: + except SchemalessError as err: tdSql.checkNotEqual(err.errno, 0) # f32 @@ -637,9 +637,9 @@ class TDTestCase: for c5 in [f"{-3.4028234664*(10**38)}f32", f"{3.4028234664*(10**38)}f32"]: input_sql = self.genFullTypeSql(c5=c5)[0] try: - self._conn.insert_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 0) raise Exception("should not reach here") - except LinesError as err: + except SchemalessError as err: tdSql.checkNotEqual(err.errno, 0) # f64 @@ -650,34 +650,34 @@ class TDTestCase: for c6 in [f'{-1.797693134862316*(10**308)}f64', f'{-1.797693134862316*(10**308)}f64']: input_sql = self.genFullTypeSql(c6=c6)[0] try: - self._conn.insert_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 0) raise Exception("should not reach here") - except LinesError as err: + except SchemalessError as err: tdSql.checkNotEqual(err.errno, 0) # # binary stb_name = self.getLongName(7, "letters") input_sql = f'{stb_name},t0=t c0=f,c1="{self.getLongName(16374, "letters")}" 1626006833639000000ns' - self._conn.insert_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 0) input_sql = f'{stb_name},t0=t c0=f,c1="{self.getLongName(16375, "letters")}" 1626006833639000000ns' try: - self._conn.insert_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 0) raise Exception("should not reach here") - except LinesError as err: + except SchemalessError as err: tdSql.checkNotEqual(err.errno, 0) # nchar # * legal nchar could not be larger than 16374/4 stb_name = self.getLongName(7, "letters") input_sql = f'{stb_name},t0=t c0=f,c1=L"{self.getLongName(4093, "letters")}" 1626006833639000000ns' - self._conn.insert_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 0) input_sql = f'{stb_name},t0=t c0=f,c1=L"{self.getLongName(4094, "letters")}" 1626006833639000000ns' try: - self._conn.insert_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 0) raise Exception("should not reach here") - except LinesError as err: + except SchemalessError as err: tdSql.checkNotEqual(err.errno, 0) def tagColIllegalValueCheckCase(self): @@ -690,15 +690,15 @@ class TDTestCase: for i in ["TrUe", "tRue", "trUe", "truE", "FalsE", "fAlse", "faLse", "falSe", "falsE"]: input_sql1 = self.genFullTypeSql(t0=i)[0] try: - self._conn.insert_lines([input_sql1]) + self._conn.schemaless_insert([input_sql1], 0) raise Exception("should not reach here") - except LinesError as err: + except SchemalessError as err: tdSql.checkNotEqual(err.errno, 0) input_sql2 = self.genFullTypeSql(c0=i)[0] try: - self._conn.insert_lines([input_sql2]) + self._conn.schemaless_insert([input_sql2], 0) raise Exception("should not reach here") - except LinesError as err: + except SchemalessError as err: tdSql.checkNotEqual(err.errno, 0) # i8 i16 i32 i64 f32 f64 @@ -718,9 +718,9 @@ class TDTestCase: self.genFullTypeSql(c9="1s1u64")[0] ]: try: - self._conn.insert_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 0) raise Exception("should not reach here") - except LinesError as err: + except SchemalessError as err: tdSql.checkNotEqual(err.errno, 0) # check binary and nchar blank @@ -731,9 +731,9 @@ class TDTestCase: input_sql4 = f'{stb_name},t0=t,t1=L"abc aaa" c0=f 1626006833639000000ns' for input_sql in [input_sql1, input_sql2, input_sql3, input_sql4]: try: - self._conn.insert_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 0) raise Exception("should not reach here") - except LinesError as err: + except SchemalessError as err: tdSql.checkNotEqual(err.errno, 0) # check accepted binary and nchar symbols @@ -741,8 +741,8 @@ class TDTestCase: for symbol in list('~!@#$¥%^&*()-+={}|[]、「」:;'): input_sql1 = f'{stb_name},t0=t c0=f,c1="abc{symbol}aaa" 1626006833639000000ns' input_sql2 = f'{stb_name},t0=t,t1="abc{symbol}aaa" c0=f 1626006833639000000ns' - self._conn.insert_lines([input_sql1]) - self._conn.insert_lines([input_sql2]) + self._conn.schemaless_insert([input_sql1], 0) + self._conn.schemaless_insert([input_sql2], 0) def duplicateIdTagColInsertCheckCase(self): @@ -752,33 +752,33 @@ class TDTestCase: self.cleanStb() input_sql_id = self.genFullTypeSql(id_double_tag=True)[0] try: - self._conn.insert_lines([input_sql_id]) + self._conn.schemaless_insert([input_sql_id], 0) raise Exception("should not reach here") - except LinesError as err: + except SchemalessError as err: tdSql.checkNotEqual(err.errno, 0) input_sql = self.genFullTypeSql()[0] input_sql_tag = input_sql.replace("t5", "t6") try: - self._conn.insert_lines([input_sql_tag]) + self._conn.schemaless_insert([input_sql_tag], 0) raise Exception("should not reach here") - except LinesError as err: + except SchemalessError as err: tdSql.checkNotEqual(err.errno, 0) input_sql = self.genFullTypeSql()[0] input_sql_col = input_sql.replace("c5", "c6") try: - self._conn.insert_lines([input_sql_col]) + self._conn.schemaless_insert([input_sql_col], 0) raise Exception("should not reach here") - except LinesError as err: + except SchemalessError as err: tdSql.checkNotEqual(err.errno, 0) input_sql = self.genFullTypeSql()[0] input_sql_col = input_sql.replace("c5", "C6") try: - self._conn.insert_lines([input_sql_col]) + self._conn.schemaless_insert([input_sql_col], 0) raise Exception("should not reach here") - except LinesError as err: + except SchemalessError as err: tdSql.checkNotEqual(err.errno, 0) ##### stb exist ##### @@ -802,7 +802,7 @@ class TDTestCase: self.cleanStb() input_sql, stb_name = self.genFullTypeSql() self.resCmp(input_sql, stb_name) - self._conn.insert_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 0) self.resCmp(input_sql, stb_name) def tagColBinaryNcharLengthCheckCase(self): @@ -869,7 +869,7 @@ class TDTestCase: tdSql.checkRows(1) tdSql.checkEqual(tb_name1, tb_name2) input_sql, stb_name = self.genFullTypeSql(stb_name=stb_name, t0="f", c0="f", id_noexist_tag=True, ct_add_tag=True) - self._conn.insert_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 0) tb_name3 = self.getNoIdTbName(stb_name) tdSql.query(f"select * from {stb_name}") tdSql.checkRows(2) @@ -884,34 +884,34 @@ class TDTestCase: stb_name = self.getLongName(7, "letters") tb_name = f'{stb_name}_1' input_sql = f'{stb_name},id="{tb_name}",t0=t c0=f 1626006833639000000ns' - self._conn.insert_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 0) # * every binary and nchar must be length+2, so here is two tag, max length could not larger than 16384-2*2 input_sql = f'{stb_name},t0=t,t1="{self.getLongName(16374, "letters")}",t2="{self.getLongName(5, "letters")}" c0=f 1626006833639000000ns' - self._conn.insert_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 0) tdSql.query(f"select * from {stb_name}") tdSql.checkRows(2) input_sql = f'{stb_name},t0=t,t1="{self.getLongName(16374, "letters")}",t2="{self.getLongName(6, "letters")}" c0=f 1626006833639000000ns' try: - self._conn.insert_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 0) raise Exception("should not reach here") - except LinesError: + except SchemalessError: pass tdSql.query(f"select * from {stb_name}") tdSql.checkRows(2) # # * check col，col+ts max in describe ---> 16143 input_sql = f'{stb_name},t0=t c0=f,c1="{self.getLongName(16374, "letters")}",c2="{self.getLongName(16374, "letters")}",c3="{self.getLongName(16374, "letters")}",c4="{self.getLongName(12, "letters")}" 1626006833639000000ns' - self._conn.insert_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 0) tdSql.query(f"select * from {stb_name}") tdSql.checkRows(3) input_sql = f'{stb_name},t0=t c0=f,c1="{self.getLongName(16374, "letters")}",c2="{self.getLongName(16374, "letters")}",c3="{self.getLongName(16374, "letters")}",c4="{self.getLongName(13, "letters")}" 1626006833639000000ns' try: - self._conn.insert_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 0) raise Exception("should not reach here") - except LinesError as err: + except SchemalessError as err: tdSql.checkNotEqual(err.errno, 0) tdSql.query(f"select * from {stb_name}") tdSql.checkRows(3) @@ -925,31 +925,31 @@ class TDTestCase: stb_name = self.getLongName(7, "letters") tb_name = f'{stb_name}_1' input_sql = f'{stb_name},id="{tb_name}",t0=t c0=f 1626006833639000000ns' - code = self._conn.insert_lines([input_sql]) + code = self._conn.schemaless_insert([input_sql], 0) # * legal nchar could not be larger than 16374/4 input_sql = f'{stb_name},t0=t,t1=L"{self.getLongName(4093, "letters")}",t2=L"{self.getLongName(1, "letters")}" c0=f 1626006833639000000ns' - self._conn.insert_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 0) tdSql.query(f"select * from {stb_name}") tdSql.checkRows(2) input_sql = f'{stb_name},t0=t,t1=L"{self.getLongName(4093, "letters")}",t2=L"{self.getLongName(2, "letters")}" c0=f 1626006833639000000ns' try: - self._conn.insert_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 0) raise Exception("should not reach here") - except LinesError as err: + except SchemalessError as err: tdSql.checkNotEqual(err.errno, 0) tdSql.query(f"select * from {stb_name}") tdSql.checkRows(2) input_sql = f'{stb_name},t0=t c0=f,c1=L"{self.getLongName(4093, "letters")}",c2=L"{self.getLongName(4093, "letters")}",c3=L"{self.getLongName(4093, "letters")}",c4=L"{self.getLongName(4, "letters")}" 1626006833639000000ns' - self._conn.insert_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 0) tdSql.query(f"select * from {stb_name}") tdSql.checkRows(3) input_sql = f'{stb_name},t0=t c0=f,c1=L"{self.getLongName(4093, "letters")}",c2=L"{self.getLongName(4093, "letters")}",c3=L"{self.getLongName(4093, "letters")}",c4=L"{self.getLongName(5, "letters")}" 1626006833639000000ns' try: - self._conn.insert_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 0) raise Exception("should not reach here") - except LinesError as err: + except SchemalessError as err: tdSql.checkNotEqual(err.errno, 0) tdSql.query(f"select * from {stb_name}") tdSql.checkRows(3) @@ -971,7 +971,7 @@ class TDTestCase: "st123456,t1=4i64,t3=\"t4\",t2=5f64,t4=5f64 c1=3i64,c3=L\"passitagin\",c2=true,c4=5f64,c5=5f64,c6=7u64 1626006933640000000ns", "st123456,t1=4i64,t3=\"t4\",t2=5f64,t4=5f64 c1=3i64,c3=L\"passitagin_stf\",c2=false,c5=5f64,c6=7u64 1626006933641000000ns" ] - self._conn.insert_lines(lines) + self._conn.schemaless_insert(lines, 0) def multiInsertCheckCase(self, count): """ @@ -984,7 +984,7 @@ class TDTestCase: for i in range(count): input_sql = self.genFullTypeSql(stb_name=stb_name, t7=f'"{self.getLongName(8, "letters")}"', c7=f'"{self.getLongName(8, "letters")}"', id_noexist_tag=True)[0] sql_list.append(input_sql) - self._conn.insert_lines(sql_list) + self._conn.schemaless_insert(sql_list, 0) def batchErrorInsertCheckCase(self): """ @@ -995,9 +995,9 @@ class TDTestCase: lines = ["st123456,t1=3i64,t2=4f64,t3=\"t3\" c1=3i64,c3=L\"passit\",c2=false,c4=4f64 1626006833639000000ns", f"{stb_name},t2=5f64,t3=L\"ste\" c1=tRue,c2=4i64,c3=\"iam\" 1626056811823316532ns"] try: - self._conn.insert_lines(lines) + self._conn.schemaless_insert(lines, 0) raise Exception("should not reach here") - except LinesError as err: + except SchemalessError as err: tdSql.checkNotEqual(err.errno, 0) def genSqlList(self, count=5, stb_name="", tb_name=""): @@ -1049,7 +1049,7 @@ class TDTestCase: def genMultiThreadSeq(self, sql_list): tlist = list() for insert_sql in sql_list: - t = threading.Thread(target=self._conn.insert_lines,args=([insert_sql[0]],)) + t = threading.Thread(target=self._conn.schemaless_insert,args=([insert_sql[0]], 0)) tlist.append(t) return tlist @@ -1248,17 +1248,17 @@ class TDTestCase: input_sql1 = "rfasta,id=\"rfasta_1\",t0=true,t1=127i8,t2=32767i16,t3=2147483647i32,t4=9223372036854775807i64,t5=11.12345f32,t6=22.123456789f64,t7=\"ddzhiksj\",t8=L\"ncharTagValue\" c0=True,c1=127i8,c2=32767i16,c3=2147483647i32,c4=9223372036854775807i64,c5=11.12345f32,c6=22.123456789f64,c7=\"bnhwlgvj\",c8=L\"ncharTagValue\",c9=7u64 1626006933640000000ns" input_sql2 = "rfasta,id=\"rfasta_1\",t0=true,t1=127i8,t2=32767i16,t3=2147483647i32,t4=9223372036854775807i64,t5=11.12345f32,t6=22.123456789f64 c0=True,c1=127i8,c2=32767i16,c3=2147483647i32,c4=9223372036854775807i64,c5=11.12345f32,c6=22.123456789f64 1626006933640000000ns" try: - self._conn.insert_lines([input_sql1]) - self._conn.insert_lines([input_sql2]) - except LinesError as err: + self._conn.schemaless_insert([input_sql1], 0) + self._conn.schemaless_insert([input_sql2], 0) + except SchemalessError as err: print(err.errno) - # self._conn.insert_lines([input_sql2]) + # self._conn.schemaless_insert([input_sql2], 0) # input_sql3 = f'abcd,id="cc¥Ec",t0=True,t1=127i8,t2=32767i16,t3=2147483647i32,t4=9223372036854775807i64,t5=11.12345f32,t6=22.123456789f64,t7="ndsfdrum",t8=L"ncharTagValue" c0=f,c1=127i8,c2=32767i16,c3=2147483647i32,c4=9223372036854775807i64,c5=11.12345f32,c6=22.123456789f64,c7="igwoehkm",c8=L"ncharColValue",c9=7u64 0' # print(input_sql3) # input_sql4 = 'hmemeb,id="kilrcrldgf",t0=F,t1=127i8,t2=32767i16,t3=2147483647i32,t4=9223372036854775807i64,t5=11.12345f32,t6=22.123456789f64,t7="fysodjql",t8=L"ncharTagValue" c0=True,c1=127i8,c2=32767i16,c3=2147483647i32,c4=9223372036854775807i64,c5=11.12345f32,c6=22.123456789f64,c7="waszbfvc",c8=L"ncharColValue",c9=7u64 0' - # code = self._conn.insert_lines([input_sql3]) + # code = self._conn.schemaless_insert([input_sql3], 0) # print(code) - # self._conn.insert_lines([input_sql4]) + # self._conn.schemaless_insert([input_sql4], 0) def runAll(self): self.initCheckCase() diff --git a/tests/pytest/tools/schemalessInsertPerformance.py b/tests/pytest/tools/schemalessInsertPerformance.py index 5e009a21296bb09c7210a7109aea9dd43bf7a847..b5adb7d56c60ca5204f81589493ad754389d52ca 100644 --- a/tests/pytest/tools/schemalessInsertPerformance.py +++ b/tests/pytest/tools/schemalessInsertPerformance.py @@ -14,7 +14,7 @@ import traceback import random import string -from taos.error import LinesError +from taos.error import SchemalessError import datetime import time from copy import deepcopy @@ -172,28 +172,28 @@ class TDTestCase: def perfTableInsert(self): table_generator = self.tableGenerator() for input_sql in table_generator: - self._conn.insert_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 0) # for i in range(10): - # self._conn.insert_lines([input_sql]) + # self._conn.schemaless_insert([input_sql], 0) def perfDataInsert(self, count=4): table_generator = self.tableGenerator(count=count) ts = int(time.time()) for input_sql in table_generator: print("input_sql-----------", input_sql) - self._conn.insert_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 0) for i in range(100000): ts -= 1 input_sql_new = self.replaceLastStr(input_sql, str(ts)) + 's' print("input_sql_new---------", input_sql_new) - self._conn.insert_lines([input_sql_new]) + self._conn.schemaless_insert([input_sql_new], 0) def batchInsertTable(self, batch_list): for insert_list in batch_list: print(threading.current_thread().name, "length=", len(insert_list)) print(threading.current_thread().name, 'firstline', insert_list[0]) print(threading.current_thread().name, 'lastline:', insert_list[-1]) - self._conn.insert_lines(insert_list) + self._conn.schemaless_insert(insert_list, 0) print(threading.current_thread().name, 'end') def genTableThread(self, thread_count=10): @@ -218,7 +218,7 @@ class TDTestCase: def createStb(self, count=4): input_sql = self.getPerfSql(count=count, init=True) - self._conn.insert_lines([input_sql]) + self._conn.schemaless_insert([input_sql], 0) def threadInsertTable(self, end_list, thread_count=10): threads = list() @@ -238,7 +238,7 @@ class TDTestCase: # def createTb(self, count=4): # input_sql = self.getPerfSql(count=count) # for i in range(10000): - # self._conn.insert_lines([input_sql]) + # self._conn.schemaless_insert([input_sql], 0) # def createTb1(self, count=4): # start_time = time.time() @@ -273,8 +273,8 @@ class TDTestCase: # def test(self): # sql1 = 'stb,id="init",t0=14865i32,t1="tvnqbjuqck" c0=37i32,c1=217i32,c2=3i32,c3=88i32 1626006833640ms' # sql2 = 'stb,id="init",t0=14865i32,t1="tvnqbjuqck" c0=38i32,c1=217i32,c2=3i32,c3=88i32 1626006833641ms' - # self._conn.insert_lines([sql1]) - # self._conn.insert_lines([sql2]) + # self._conn.schemaless_insert([sql1], 0) + # self._conn.schemaless_insert([sql2], 0) def run(self): print("running {}".format(__file__)) diff --git a/tests/script/api/openTSDBTest.c b/tests/script/api/openTSDBTest.c index e4f892fa408e8c024daa4e338d3af7a706e5d0f9..32ec188d0f1b94bd7f457aa7470bef2c8b738e5a 100644 --- a/tests/script/api/openTSDBTest.c +++ b/tests/script/api/openTSDBTest.c @@ -26,7 +26,7 @@ void verify_telnet_insert(TAOS* taos) { "stb0_1 1626006833639000000ns 4i8 host=\"host0\" interface=\"eth0\"", "stb0_2 1626006833639000000ns 4i8 host=\"host0\" interface=\"eth0\"", }; - code = taos_insert_telnet_lines(taos, lines0, 3); + code = taos_schemaless_insert(taos, lines0, 3, 1); if (code) { printf("lines0 code: %d, %s.\n", code, tstrerror(code)); } @@ -40,7 +40,7 @@ void verify_telnet_insert(TAOS* taos) { "stb1 1626006833651ms 5i8 host=\"host0\"", "stb1 0 6i8 host=\"host0\"", }; - code = taos_insert_telnet_lines(taos, lines1, 6); + code = taos_schemaless_insert(taos, lines1, 6, 1); if (code) { printf("lines1 code: %d, %s.\n", code, tstrerror(code)); } @@ -51,7 +51,7 @@ void verify_telnet_insert(TAOS* taos) { "stb2_0 1626006833651ms -127i8 host=\"host0\"", "stb2_0 1626006833652ms 127i8 host=\"host0\"" }; - code = taos_insert_telnet_lines(taos, lines2_0, 2); + code = taos_schemaless_insert(taos, lines2_0, 2, 1); if (code) { printf("lines2_0 code: %d, %s.\n", code, tstrerror(code)); } @@ -61,7 +61,7 @@ void verify_telnet_insert(TAOS* taos) { "stb2_1 1626006833651ms -32767i16 host=\"host0\"", "stb2_1 1626006833652ms 32767i16 host=\"host0\"" }; - code = taos_insert_telnet_lines(taos, lines2_1, 2); + code = taos_schemaless_insert(taos, lines2_1, 2, 1); if (code) { printf("lines2_1 code: %d, %s.\n", code, tstrerror(code)); } @@ -71,7 +71,7 @@ void verify_telnet_insert(TAOS* taos) { "stb2_2 1626006833651ms -2147483647i32 host=\"host0\"", "stb2_2 1626006833652ms 2147483647i32 host=\"host0\"" }; - code = taos_insert_telnet_lines(taos, lines2_2, 2); + code = taos_schemaless_insert(taos, lines2_2, 2, 1); if (code) { printf("lines2_2 code: %d, %s.\n", code, tstrerror(code)); } @@ -82,7 +82,7 @@ void verify_telnet_insert(TAOS* taos) { "stb2_3 1626006833652ms 9223372036854775807i64 host=\"host0\"", "stb2_3 1626006833662ms 9223372036854775807 host=\"host0\"" }; - code = taos_insert_telnet_lines(taos, lines2_3, 3); + code = taos_schemaless_insert(taos, lines2_3, 3, 1); if (code) { printf("lines2_3 code: %d, %s.\n", code, tstrerror(code)); } @@ -100,7 +100,7 @@ void verify_telnet_insert(TAOS* taos) { "stb2_4 1626006833700ms 3.4E38f32 host=\"host0\"", "stb2_4 1626006833710ms -3.4E38f32 host=\"host0\"" }; - code = taos_insert_telnet_lines(taos, lines2_4, 10); + code = taos_schemaless_insert(taos, lines2_4, 10, 1); if (code) { printf("lines2_4 code: %d, %s.\n", code, tstrerror(code)); } @@ -119,7 +119,7 @@ void verify_telnet_insert(TAOS* taos) { "stb2_5 1626006833700ms -1.7E308f64 host=\"host0\"", "stb2_5 1626006833710ms 3.15 host=\"host0\"" }; - code = taos_insert_telnet_lines(taos, lines2_5, 11); + code = taos_schemaless_insert(taos, lines2_5, 11, 1); if (code) { printf("lines2_5 code: %d, %s.\n", code, tstrerror(code)); } @@ -137,7 +137,7 @@ void verify_telnet_insert(TAOS* taos) { "stb2_6 1626006833690ms False host=\"host0\"", "stb2_6 1626006833700ms FALSE host=\"host0\"" }; - code = taos_insert_telnet_lines(taos, lines2_6, 10); + code = taos_schemaless_insert(taos, lines2_6, 10, 1); if (code) { printf("lines2_6 code: %d, %s.\n", code, tstrerror(code)); } @@ -148,7 +148,7 @@ void verify_telnet_insert(TAOS* taos) { "stb2_7 1626006833620ms \"binary_val.:;,./?|+-=\" host=\"host0\"", "stb2_7 1626006833630ms \"binary_val.()[]{}<>\" host=\"host0\"" }; - code = taos_insert_telnet_lines(taos, lines2_7, 3); + code = taos_schemaless_insert(taos, lines2_7, 3, 1); if (code) { printf("lines2_7 code: %d, %s.\n", code, tstrerror(code)); } @@ -158,7 +158,7 @@ void verify_telnet_insert(TAOS* taos) { "stb2_8 1626006833610ms L\"nchar_val数值一\" host=\"host0\"", "stb2_8 1626006833620ms L\"nchar_val数值二\" host=\"host0\"" }; - code = taos_insert_telnet_lines(taos, lines2_8, 2); + code = taos_schemaless_insert(taos, lines2_8, 2, 1); if (code) { printf("lines2_8 code: %d, %s.\n", code, tstrerror(code)); } @@ -169,7 +169,7 @@ void verify_telnet_insert(TAOS* taos) { "stb3_0 1626006833610ms 1 t1=127i8 t2=32767i16 t3=2147483647i32 t4=9223372036854775807i64 t5=3.4E38f32 t6=1.7E308f64 t7=true t8=\"binary_val_1\" t9=L\"标签值1\"", "stb3_0 1626006833610ms 2 t1=-127i8 t2=-32767i16 t3=-2147483647i32 t4=-9223372036854775807i64 t5=-3.4E38f32 t6=-1.7E308f64 t7=false t8=\"binary_val_2\" t9=L\"标签值2\"" }; - code = taos_insert_telnet_lines(taos, lines3_0, 2); + code = taos_schemaless_insert(taos, lines3_0, 2, 1); if (code) { printf("lines3_0 code: %d, %s.\n", code, tstrerror(code)); } @@ -180,7 +180,7 @@ void verify_telnet_insert(TAOS* taos) { "stb3_1 1626006833610ms 2 host=\"host2\" iD=\"child_table2\"", "stb3_1 1626006833610ms 3 ID=\"child_table3\" host=\"host3\"" }; - code = taos_insert_telnet_lines(taos, lines3_1, 3); + code = taos_schemaless_insert(taos, lines3_1, 3, 1); if (code) { printf("lines3_1 code: %d, %s.\n", code, tstrerror(code)); } @@ -201,7 +201,7 @@ void verify_json_insert(TAOS* taos) { (void)taos_select_db(taos, "db"); int32_t code = 0; - char *message = + char *message[] = { "{ \ \"metric\":\"cpu_load_0\", \ \"timestamp\": 1626006833610123, \ @@ -212,14 +212,14 @@ void verify_json_insert(TAOS* taos) { \"interface1\": \"eth0\", \ \"Id\": \"tb0\" \ } \ - }"; + }"}; - code = taos_insert_json_payload(taos, message); + code = taos_schemaless_insert(taos, message, 0, 2); if (code) { printf("payload_0 code: %d, %s.\n", code, tstrerror(code)); } - char *message1 = + char *message1[] = { "[ \ { \ \"metric\":\"cpu_load_1\", \ @@ -243,14 +243,14 @@ void verify_json_insert(TAOS* taos) { \"Id\": \"tb2\" \ } \ } \ - ]"; + ]"}; - code = taos_insert_json_payload(taos, message1); + code = taos_schemaless_insert(taos, message1, 0, 2); if (code) { printf("payload_1 code: %d, %s.\n", code, tstrerror(code)); } - char *message2 = + char *message2[] = { "[ \ { \ \"metric\":\"cpu_load_3\", \ @@ -295,15 +295,15 @@ void verify_json_insert(TAOS* taos) { \"Id\": \"tb4\" \ } \ } \ - ]"; - code = taos_insert_json_payload(taos, message2); + ]"}; + code = taos_schemaless_insert(taos, message2, 0, 2); if (code) { printf("payload_2 code: %d, %s.\n", code, tstrerror(code)); } cJSON *payload, *tags; - char *payload_str; + char *payload_str[1]; /* Default format */ //number @@ -317,14 +317,14 @@ void verify_json_insert(TAOS* taos) { cJSON_AddNumberToObject(tags, "t3", 10); cJSON_AddStringToObject(tags, "t4", "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>"); cJSON_AddItemToObject(payload, "tags", tags); - payload_str = cJSON_Print(payload); + *payload_str = cJSON_Print(payload); //printf("%s\n", payload_str); - code = taos_insert_json_payload(taos, payload_str); + code = taos_schemaless_insert(taos, payload_str, 0, 2); if (code) { printf("payload0_0 code: %d, %s.\n", code, tstrerror(code)); } - free(payload_str); + free(*payload_str); cJSON_Delete(payload); //true @@ -338,14 +338,14 @@ void verify_json_insert(TAOS* taos) { cJSON_AddNumberToObject(tags, "t3", 10); cJSON_AddStringToObject(tags, "t4", "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>"); cJSON_AddItemToObject(payload, "tags", tags); - payload_str = cJSON_Print(payload); + *payload_str = cJSON_Print(payload); //printf("%s\n", payload_str); - code = taos_insert_json_payload(taos, payload_str); + code = taos_schemaless_insert(taos, payload_str, 0, 2); if (code) { printf("payload0_1 code: %d, %s.\n", code, tstrerror(code)); } - free(payload_str); + free(*payload_str); cJSON_Delete(payload); //false @@ -359,14 +359,14 @@ void verify_json_insert(TAOS* taos) { cJSON_AddNumberToObject(tags, "t3", 10); cJSON_AddStringToObject(tags, "t4", "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>"); cJSON_AddItemToObject(payload, "tags", tags); - payload_str = cJSON_Print(payload); + *payload_str = cJSON_Print(payload); //printf("%s\n", payload_str); - code = taos_insert_json_payload(taos, payload_str); + code = taos_schemaless_insert(taos, payload_str, 0, 2); if (code) { printf("payload0_2 code: %d, %s.\n", code, tstrerror(code)); } - free(payload_str); + free(*payload_str); cJSON_Delete(payload); //string @@ -380,14 +380,14 @@ void verify_json_insert(TAOS* taos) { cJSON_AddNumberToObject(tags, "t3", 10); cJSON_AddStringToObject(tags, "t4", "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>"); cJSON_AddItemToObject(payload, "tags", tags); - payload_str = cJSON_Print(payload); + *payload_str = cJSON_Print(payload); //printf("%s\n", payload_str); - code = taos_insert_json_payload(taos, payload_str); + code = taos_schemaless_insert(taos, payload_str, 0, 2); if (code) { printf("payload0_3 code: %d, %s.\n", code, tstrerror(code)); } - free(payload_str); + free(*payload_str); cJSON_Delete(payload); //timestamp 0 -> current time @@ -401,38 +401,14 @@ void verify_json_insert(TAOS* taos) { cJSON_AddNumberToObject(tags, "t3", 10); cJSON_AddStringToObject(tags, "t4", "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>"); cJSON_AddItemToObject(payload, "tags", tags); - payload_str = cJSON_Print(payload); + *payload_str = cJSON_Print(payload); //printf("%s\n", payload_str); - code = taos_insert_json_payload(taos, payload_str); + code = taos_schemaless_insert(taos, payload_str, 0, 2); if (code) { printf("payload0_4 code: %d, %s.\n", code, tstrerror(code)); } - free(payload_str); - cJSON_Delete(payload); - - //ID - payload = cJSON_CreateObject(); - cJSON_AddStringToObject(payload, "metric", "stb0_5"); - cJSON_AddNumberToObject(payload, "timestamp", 0); - cJSON_AddNumberToObject(payload, "value", 123); - tags = cJSON_CreateObject(); - cJSON_AddStringToObject(tags, "ID", "tb0_5"); - cJSON_AddTrueToObject(tags, "t1"); - cJSON_AddStringToObject(tags, "iD", "tb000"); - cJSON_AddFalseToObject(tags, "t2"); - cJSON_AddNumberToObject(tags, "t3", 10); - cJSON_AddStringToObject(tags, "t4", "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>"); - cJSON_AddStringToObject(tags, "id", "tb555"); - cJSON_AddItemToObject(payload, "tags", tags); - payload_str = cJSON_Print(payload); - //printf("%s\n", payload_str); - - code = taos_insert_json_payload(taos, payload_str); - if (code) { - printf("payload0_5 code: %d, %s.\n", code, tstrerror(code)); - } - free(payload_str); + free(*payload_str); cJSON_Delete(payload); /* Nested format */ @@ -454,14 +430,14 @@ void verify_json_insert(TAOS* taos) { cJSON_AddNumberToObject(tags, "t3", 10); cJSON_AddStringToObject(tags, "t4", "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>"); cJSON_AddItemToObject(payload, "tags", tags); - payload_str = cJSON_Print(payload); + *payload_str = cJSON_Print(payload); //printf("%s\n", payload_str); - code = taos_insert_json_payload(taos, payload_str); + code = taos_schemaless_insert(taos, payload_str, 0, 2); if (code) { printf("payload1_0 code: %d, %s.\n", code, tstrerror(code)); } - free(payload_str); + free(*payload_str); cJSON_Delete(payload); //milleseconds @@ -480,14 +456,14 @@ void verify_json_insert(TAOS* taos) { cJSON_AddNumberToObject(tags, "t3", 10); cJSON_AddStringToObject(tags, "t4", "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>"); cJSON_AddItemToObject(payload, "tags", tags); - payload_str = cJSON_Print(payload); + *payload_str = cJSON_Print(payload); //printf("%s\n", payload_str); - code = taos_insert_json_payload(taos, payload_str); + code = taos_schemaless_insert(taos, payload_str, 0, 2); if (code) { printf("payload1_1 code: %d, %s.\n", code, tstrerror(code)); } - free(payload_str); + free(*payload_str); cJSON_Delete(payload); //microseconds @@ -506,40 +482,14 @@ void verify_json_insert(TAOS* taos) { cJSON_AddNumberToObject(tags, "t3", 10); cJSON_AddStringToObject(tags, "t4", "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>"); cJSON_AddItemToObject(payload, "tags", tags); - payload_str = cJSON_Print(payload); + *payload_str = cJSON_Print(payload); //printf("%s\n", payload_str); - code = taos_insert_json_payload(taos, payload_str); + code = taos_schemaless_insert(taos, payload_str, 0, 2); if (code) { printf("payload1_2 code: %d, %s.\n", code, tstrerror(code)); } - free(payload_str); - cJSON_Delete(payload); - - //nanoseconds - payload = cJSON_CreateObject(); - cJSON_AddStringToObject(payload, "metric", "stb1_3"); - - timestamp = cJSON_CreateObject(); - cJSON_AddNumberToObject(timestamp, "value", (double)1626006833610123321); - cJSON_AddStringToObject(timestamp, "type", "ns"); - cJSON_AddItemToObject(payload, "timestamp", timestamp); - - cJSON_AddNumberToObject(payload, "value", 10); - tags = cJSON_CreateObject(); - cJSON_AddTrueToObject(tags, "t1"); - cJSON_AddFalseToObject(tags, "t2"); - cJSON_AddNumberToObject(tags, "t3", 10); - cJSON_AddStringToObject(tags, "t4", "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>"); - cJSON_AddItemToObject(payload, "tags", tags); - payload_str = cJSON_Print(payload); - //printf("%s\n", payload_str); - - code = taos_insert_json_payload(taos, payload_str); - if (code) { - printf("payload1_3 code: %d, %s.\n", code, tstrerror(code)); - } - free(payload_str); + free(*payload_str); cJSON_Delete(payload); //now @@ -558,14 +508,14 @@ void verify_json_insert(TAOS* taos) { cJSON_AddNumberToObject(tags, "t3", 10); cJSON_AddStringToObject(tags, "t4", "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>"); cJSON_AddItemToObject(payload, "tags", tags); - payload_str = cJSON_Print(payload); + *payload_str = cJSON_Print(payload); //printf("%s\n", payload_str); - code = taos_insert_json_payload(taos, payload_str); + code = taos_schemaless_insert(taos, payload_str, 0, 2); if (code) { printf("payload1_4 code: %d, %s.\n", code, tstrerror(code)); } - free(payload_str); + free(*payload_str); cJSON_Delete(payload); //metric value @@ -590,14 +540,14 @@ void verify_json_insert(TAOS* taos) { cJSON_AddNumberToObject(tags, "t3", 10); cJSON_AddStringToObject(tags, "t4", "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>"); cJSON_AddItemToObject(payload, "tags", tags); - payload_str = cJSON_Print(payload); + *payload_str = cJSON_Print(payload); //printf("%s\n", payload_str); - code = taos_insert_json_payload(taos, payload_str); + code = taos_schemaless_insert(taos, payload_str, 0, 2); if (code) { printf("payload2_0 code: %d, %s.\n", code, tstrerror(code)); } - free(payload_str); + free(*payload_str); cJSON_Delete(payload); //tinyint @@ -620,14 +570,14 @@ void verify_json_insert(TAOS* taos) { cJSON_AddNumberToObject(tags, "t3", 10); cJSON_AddStringToObject(tags, "t4", "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>"); cJSON_AddItemToObject(payload, "tags", tags); - payload_str = cJSON_Print(payload); + *payload_str = cJSON_Print(payload); //printf("%s\n", payload_str); - code = taos_insert_json_payload(taos, payload_str); + code = taos_schemaless_insert(taos, payload_str, 0, 2); if (code) { printf("payload2_1 code: %d, %s.\n", code, tstrerror(code)); } - free(payload_str); + free(*payload_str); cJSON_Delete(payload); //smallint @@ -650,14 +600,14 @@ void verify_json_insert(TAOS* taos) { cJSON_AddNumberToObject(tags, "t3", 10); cJSON_AddStringToObject(tags, "t4", "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>"); cJSON_AddItemToObject(payload, "tags", tags); - payload_str = cJSON_Print(payload); + *payload_str = cJSON_Print(payload); //printf("%s\n", payload_str); - code = taos_insert_json_payload(taos, payload_str); + code = taos_schemaless_insert(taos, payload_str, 0, 2); if (code) { printf("payload2_2 code: %d, %s.\n", code, tstrerror(code)); } - free(payload_str); + free(*payload_str); cJSON_Delete(payload); //int @@ -680,14 +630,14 @@ void verify_json_insert(TAOS* taos) { cJSON_AddNumberToObject(tags, "t3", 10); cJSON_AddStringToObject(tags, "t4", "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>"); cJSON_AddItemToObject(payload, "tags", tags); - payload_str = cJSON_Print(payload); + *payload_str = cJSON_Print(payload); //printf("%s\n", payload_str); - code = taos_insert_json_payload(taos, payload_str); + code = taos_schemaless_insert(taos, payload_str, 0, 2); if (code) { printf("payload2_3 code: %d, %s.\n", code, tstrerror(code)); } - free(payload_str); + free(*payload_str); cJSON_Delete(payload); //bigint @@ -710,14 +660,14 @@ void verify_json_insert(TAOS* taos) { cJSON_AddNumberToObject(tags, "t3", 10); cJSON_AddStringToObject(tags, "t4", "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>"); cJSON_AddItemToObject(payload, "tags", tags); - payload_str = cJSON_Print(payload); + *payload_str = cJSON_Print(payload); //printf("%s\n", payload_str); - code = taos_insert_json_payload(taos, payload_str); + code = taos_schemaless_insert(taos, payload_str, 0, 2); if (code) { printf("payload2_4 code: %d, %s.\n", code, tstrerror(code)); } - free(payload_str); + free(*payload_str); cJSON_Delete(payload); //float @@ -740,14 +690,14 @@ void verify_json_insert(TAOS* taos) { cJSON_AddNumberToObject(tags, "t3", 10); cJSON_AddStringToObject(tags, "t4", "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>"); cJSON_AddItemToObject(payload, "tags", tags); - payload_str = cJSON_Print(payload); + *payload_str = cJSON_Print(payload); //printf("%s\n", payload_str); - code = taos_insert_json_payload(taos, payload_str); + code = taos_schemaless_insert(taos, payload_str, 0, 2); if (code) { printf("payload2_5 code: %d, %s.\n", code, tstrerror(code)); } - free(payload_str); + free(*payload_str); cJSON_Delete(payload); //double @@ -770,14 +720,14 @@ void verify_json_insert(TAOS* taos) { cJSON_AddNumberToObject(tags, "t3", 10); cJSON_AddStringToObject(tags, "t4", "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>"); cJSON_AddItemToObject(payload, "tags", tags); - payload_str = cJSON_Print(payload); + *payload_str = cJSON_Print(payload); //printf("%s\n", payload_str); - code = taos_insert_json_payload(taos, payload_str); + code = taos_schemaless_insert(taos, payload_str, 0, 2); if (code) { printf("payload2_6 code: %d, %s.\n", code, tstrerror(code)); } - free(payload_str); + free(*payload_str); cJSON_Delete(payload); //binary @@ -800,14 +750,14 @@ void verify_json_insert(TAOS* taos) { cJSON_AddNumberToObject(tags, "t3", 10); cJSON_AddStringToObject(tags, "t4", "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>"); cJSON_AddItemToObject(payload, "tags", tags); - payload_str = cJSON_Print(payload); + *payload_str = cJSON_Print(payload); //printf("%s\n", payload_str); - code = taos_insert_json_payload(taos, payload_str); + code = taos_schemaless_insert(taos, payload_str, 0, 2); if (code) { printf("payload2_7 code: %d, %s.\n", code, tstrerror(code)); } - free(payload_str); + free(*payload_str); cJSON_Delete(payload); //nchar @@ -830,14 +780,14 @@ void verify_json_insert(TAOS* taos) { cJSON_AddNumberToObject(tags, "t3", 10); cJSON_AddStringToObject(tags, "t4", "123_abc_.!@#$%^&*:;,./?|+-=()[]{}<>"); cJSON_AddItemToObject(payload, "tags", tags); - payload_str = cJSON_Print(payload); + *payload_str = cJSON_Print(payload); //printf("%s\n", payload_str); - code = taos_insert_json_payload(taos, payload_str); + code = taos_schemaless_insert(taos, payload_str, 0, 2); if (code) { printf("payload2_8 code: %d, %s.\n", code, tstrerror(code)); } - free(payload_str); + free(*payload_str); cJSON_Delete(payload); //tag value @@ -910,14 +860,14 @@ void verify_json_insert(TAOS* taos) { cJSON_AddItemToObject(payload, "tags", tags); - payload_str = cJSON_Print(payload); + *payload_str = cJSON_Print(payload); //printf("%s\n", payload_str); - code = taos_insert_json_payload(taos, payload_str); + code = taos_schemaless_insert(taos, payload_str, 0, 2); if (code) { printf("payload3_0 code: %d, %s.\n", code, tstrerror(code)); } - free(payload_str); + free(*payload_str); cJSON_Delete(payload); } diff --git a/tests/tsim/src/simExe.c b/tests/tsim/src/simExe.c index 397accfea57fec92dbe2b7f9b5c4b730a91e9cbd..7c3be4fbc23b2fced9184f17143f23b99f8efe49 100644 --- a/tests/tsim/src/simExe.c +++ b/tests/tsim/src/simExe.c @@ -1084,7 +1084,7 @@ bool simExecuteLineInsertCmd(SScript *script, char *rest) { simInfo("script:%s, %s", script->fileName, rest); simLogSql(buf, true); char * lines[] = {rest}; - int32_t ret = taos_insert_lines(script->taos, lines, 1); + int32_t ret = taos_schemaless_insert(script->taos, lines, 1, 0); if (ret == TSDB_CODE_SUCCESS) { simDebug("script:%s, taos:%p, %s executed. success.", script->fileName, script->taos, rest); script->linePos++; @@ -1107,7 +1107,7 @@ bool simExecuteLineInsertErrorCmd(SScript *script, char *rest) { simInfo("script:%s, %s", script->fileName, rest); simLogSql(buf, true); char * lines[] = {rest}; - int32_t ret = taos_insert_lines(script->taos, lines, 1); + int32_t ret = taos_schemaless_insert(script->taos, lines, 1, 0); if (ret == TSDB_CODE_SUCCESS) { sprintf(script->error, "script:%s, taos:%p, %s executed. expect failed, but success.", script->fileName, script->taos, rest); script->linePos++;