xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix:[TD-29793] check if column and tag name are dumplicate in schemaless

This commit is contained in:
wangmm0220 2024-04-26 11:41:41 +08:00
parent c5f45c5114
commit 19b7bb9e0c
3 changed files with 37 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/client/src/clientSml.c
View File

@ -832,7 +832,7 @@ static int32_t smlFindNearestPowerOf2(int32_t length, uint8_t type) {
return result; return result;
} }
static int32_t smlProcessSchemaAction(SSmlHandle *info, SSchema *schemaField, SHashObj *schemaHash, SArray *cols, static int32_t smlProcessSchemaAction(SSmlHandle *info, SSchema *schemaField, SHashObj *schemaHash, SArray *cols, SArray *checkDumplicateCols,
ESchemaAction *action, bool isTag) { ESchemaAction *action, bool isTag) {
int32_t code = TSDB_CODE_SUCCESS; int32_t code = TSDB_CODE_SUCCESS;
for (int j = 0; j < taosArrayGetSize(cols); ++j) { for (int j = 0; j < taosArrayGetSize(cols); ++j) {
@ -843,6 +843,13 @@ static int32_t smlProcessSchemaAction(SSmlHandle *info, SSchema *schemaField, SH
return code; return code;
} }
} }
for (int j = 0; j < taosArrayGetSize(checkDumplicateCols); ++j) {
SSmlKv *kv = (SSmlKv *)taosArrayGet(cols, j);
if(taosHashGet(schemaHash, kv->key, kv->keyLen) != NULL){
return TSDB_CODE_PAR_DUPLICATED_COLUMN;
}
}
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;
} }
@ -1106,7 +1113,7 @@ static int32_t smlModifyDBSchemas(SSmlHandle *info) {
} }
ESchemaAction action = SCHEMA_ACTION_NULL; ESchemaAction action = SCHEMA_ACTION_NULL;
code = smlProcessSchemaAction(info, pTableMeta->schema, hashTmp, sTableData->tags, &action, true); code = smlProcessSchemaAction(info, pTableMeta->schema, hashTmp, sTableData->tags, sTableData->cols, &action, true);
if (code != TSDB_CODE_SUCCESS) { if (code != TSDB_CODE_SUCCESS) {
goto end; goto end;
} }
@ -1181,7 +1188,7 @@ static int32_t smlModifyDBSchemas(SSmlHandle *info) {
taosHashPut(hashTmp, pTableMeta->schema[i].name, strlen(pTableMeta->schema[i].name), &i, SHORT_BYTES); taosHashPut(hashTmp, pTableMeta->schema[i].name, strlen(pTableMeta->schema[i].name), &i, SHORT_BYTES);
} }
action = SCHEMA_ACTION_NULL; action = SCHEMA_ACTION_NULL;
code = smlProcessSchemaAction(info, pTableMeta->schema, hashTmp, sTableData->cols, &action, false); code = smlProcessSchemaAction(info, pTableMeta->schema, hashTmp, sTableData->cols, sTableData->tags, &action, false);
if (code != TSDB_CODE_SUCCESS) { if (code != TSDB_CODE_SUCCESS) {
goto end; goto end;
} }

8
tests/system-test/7-tmq/tmq_primary_key.py
View File

@ -62,7 +62,7 @@ class TDTestCase:
while True: while True:
res = consumer.poll(1) res = consumer.poll(1)
if not res: if not res:
break continue
val = res.value() val = res.value()
if val is None: if val is None:
continue continue
@ -173,7 +173,7 @@ class TDTestCase:
while True: while True:
res = consumer.poll(1) res = consumer.poll(1)
if not res: if not res:
break continue
val = res.value() val = res.value()
if val is None: if val is None:
continue continue
@ -282,7 +282,7 @@ class TDTestCase:
while True: while True:
res = consumer.poll(1) res = consumer.poll(1)
if not res: if not res:
break continue
val = res.value() val = res.value()
if val is None: if val is None:
continue continue
@ -391,7 +391,7 @@ class TDTestCase:
while True: while True:
res = consumer.poll(1) res = consumer.poll(1)
if not res: if not res:
break continue
val = res.value() val = res.value()
if val is None: if val is None:
continue continue

23
utils/test/c/sml_test.c
View File

@ -1866,6 +1866,29 @@ int sml_td29691_Test() {
printf("%s result0:%s\n", __FUNCTION__, taos_errstr(pRes)); printf("%s result0:%s\n", __FUNCTION__, taos_errstr(pRes));
ASSERT(code == TSDB_CODE_PAR_DUPLICATED_COLUMN); ASSERT(code == TSDB_CODE_PAR_DUPLICATED_COLUMN);
taos_free_result(pRes); taos_free_result(pRes);
//check column tag name duplication when update
const char *sql7[] = {
"vbin,t1=1,t2=2,f1=ewe f2=b\"hello\" 1632299372003",
};
pRes = taos_schemaless_insert(taos, (char **)sql7, sizeof(sql7) / sizeof(sql7[0]), TSDB_SML_LINE_PROTOCOL,
TSDB_SML_TIMESTAMP_MILLI_SECONDS);
code = taos_errno(pRes);
printf("%s result0:%s\n", __FUNCTION__, taos_errstr(pRes));
ASSERT(code == TSDB_CODE_PAR_DUPLICATED_COLUMN);
taos_free_result(pRes);
//check column tag name duplication when update
const char *sql6[] = {
"vbin,t1=1 t2=2,f1=1,f2=b\"hello\" 1632299372004",
};
pRes = taos_schemaless_insert(taos, (char **)sql6, sizeof(sql6) / sizeof(sql6[0]), TSDB_SML_LINE_PROTOCOL,
TSDB_SML_TIMESTAMP_MILLI_SECONDS);
code = taos_errno(pRes);
printf("%s result0:%s\n", __FUNCTION__, taos_errstr(pRes));
ASSERT(code == TSDB_CODE_PAR_DUPLICATED_COLUMN);
taos_free_result(pRes);
taos_close(taos); taos_close(taos);
return code; return code;