Skip to content

Commit b0b1a23

Browse files
guanshengliangguanshengliang
authored
Merge pull request #28691 from taosdata/merge/3.0tomain
merge: from 3.0 to main
2 parents 6c487c3 + 952345c commit b0b1a23

File tree

8 files changed

+66
-54
lines changed

8 files changed

+66
-54
lines changed

‎include/util/taoserror.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,7 @@ int32_t taosGetErrSize();
208208
#define TSDB_CODE_TSC_COMPRESS_PARAM_ERROR TAOS_DEF_ERROR_CODE(0, 0X0233)
209209
#define TSDB_CODE_TSC_COMPRESS_LEVEL_ERROR TAOS_DEF_ERROR_CODE(0, 0X0234)
210210
#define TSDB_CODE_TSC_FAIL_GENERATE_JSON TAOS_DEF_ERROR_CODE(0, 0X0235)
211+
#define TSDB_CODE_TSC_STMT_BIND_NUMBER_ERROR TAOS_DEF_ERROR_CODE(0, 0X0236)
211212
#define TSDB_CODE_TSC_INTERNAL_ERROR TAOS_DEF_ERROR_CODE(0, 0X02FF)
212213

213214
// mnode-common

‎source/client/src/clientMain.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1803,7 +1803,7 @@ int taos_stmt_bind_param(TAOS_STMT *stmt, TAOS_MULTI_BIND *bind) {
18031803

18041804
if (bind->num > 1) {
18051805
tscError("invalid bind number %d for %s", bind->num, __FUNCTION__);
1806-
terrno = TSDB_CODE_INVALID_PARA;
1806+
terrno = TSDB_CODE_TSC_STMT_BIND_NUMBER_ERROR;
18071807
return terrno;
18081808
}
18091809

@@ -1819,7 +1819,7 @@ int taos_stmt_bind_param_batch(TAOS_STMT *stmt, TAOS_MULTI_BIND *bind) {
18191819

18201820
if (bind->num <= 0 || bind->num > INT16_MAX) {
18211821
tscError("invalid bind num %d", bind->num);
1822-
terrno = TSDB_CODE_INVALID_PARA;
1822+
terrno = TSDB_CODE_TSC_STMT_BIND_NUMBER_ERROR;
18231823
return terrno;
18241824
}
18251825

@@ -1831,7 +1831,7 @@ int taos_stmt_bind_param_batch(TAOS_STMT *stmt, TAOS_MULTI_BIND *bind) {
18311831
}
18321832
if (0 == insert && bind->num > 1) {
18331833
tscError("only one row data allowed for query");
1834-
terrno = TSDB_CODE_INVALID_PARA;
1834+
terrno = TSDB_CODE_TSC_STMT_BIND_NUMBER_ERROR;
18351835
return terrno;
18361836
}
18371837

@@ -1859,7 +1859,7 @@ int taos_stmt_bind_single_param_batch(TAOS_STMT *stmt, TAOS_MULTI_BIND *bind, in
18591859
}
18601860
if (0 == insert && bind->num > 1) {
18611861
tscError("only one row data allowed for query");
1862-
terrno = TSDB_CODE_INVALID_PARA;
1862+
terrno = TSDB_CODE_TSC_STMT_BIND_NUMBER_ERROR;
18631863
return terrno;
18641864
}
18651865

@@ -2019,15 +2019,15 @@ int taos_stmt2_bind_param(TAOS_STMT2 *stmt, TAOS_STMT2_BINDV *bindv, int32_t col
20192019

20202020
if (bind->num <= 0 || bind->num > INT16_MAX) {
20212021
tscError("invalid bind num %d", bind->num);
2022-
terrno = TSDB_CODE_INVALID_PARA;
2022+
terrno = TSDB_CODE_TSC_STMT_BIND_NUMBER_ERROR;
20232023
return terrno;
20242024
}
20252025

20262026
int32_t insert = 0;
20272027
(void)stmtIsInsert2(stmt, &insert);
20282028
if (0 == insert && bind->num > 1) {
20292029
tscError("only one row data allowed for query");
2030-
terrno = TSDB_CODE_INVALID_PARA;
2030+
terrno = TSDB_CODE_TSC_STMT_BIND_NUMBER_ERROR;
20312031
return terrno;
20322032
}
20332033

‎source/common/src/systable.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -437,6 +437,7 @@ static const SSysDbTableSchema userGrantsLogsSchema[] = {
437437
{.name = "state", .bytes = 1536 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR, .sysInfo = true},
438438
{.name = "active", .bytes = 512 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR, .sysInfo = true},
439439
{.name = "machine", .bytes = TSDB_GRANT_LOG_COL_LEN + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR, .sysInfo = true},
440+
{.name = "active_info", .bytes = 512 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR, .sysInfo = true},
440441
};
441442

442443
static const SSysDbTableSchema userMachinesSchema[] = {

‎source/util/src/terror.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ TAOS_DEFINE_ERROR(TSDB_CODE_TSC_ENCODE_PARAM_NULL, "Not found compress pa
164164
TAOS_DEFINE_ERROR(TSDB_CODE_TSC_COMPRESS_PARAM_ERROR, "Invalid compress param")
165165
TAOS_DEFINE_ERROR(TSDB_CODE_TSC_COMPRESS_LEVEL_ERROR, "Invalid compress level param")
166166
TAOS_DEFINE_ERROR(TSDB_CODE_TSC_FAIL_GENERATE_JSON, "failed to generate JSON")
167+
TAOS_DEFINE_ERROR(TSDB_CODE_TSC_STMT_BIND_NUMBER_ERROR, "bind number out of range or not match")
167168

168169

169170
TAOS_DEFINE_ERROR(TSDB_CODE_TSC_INTERNAL_ERROR, "Internal error")

‎source/util/test/errorCodeTable.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ TSDB_CODE_TSC_ENCODE_PARAM_ERROR = 0x80000231
9797
TSDB_CODE_TSC_ENCODE_PARAM_NULL = 0x80000232
9898
TSDB_CODE_TSC_COMPRESS_PARAM_ERROR = 0x80000233
9999
TSDB_CODE_TSC_COMPRESS_LEVEL_ERROR = 0x80000234
100+
TSDB_CODE_TSC_STMT_BIND_NUMBER_ERROR = 0x80000236
100101
TSDB_CODE_TSC_INTERNAL_ERROR = 0x800002FF
101102
TSDB_CODE_MND_REQ_REJECTED = 0x80000300
102103
TSDB_CODE_MND_NO_RIGHTS = 0x80000303

‎tests/system-test/0-others/information_schema.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ def ins_columns_check(self):
222222

223223
tdSql.query("select * from information_schema.ins_columns where db_name ='information_schema'")
224224
tdLog.info(len(tdSql.queryResult))
225-
tdSql.checkEqual(True, len(tdSql.queryResult) in range(280, 281))
225+
tdSql.checkEqual(True, len(tdSql.queryResult) in range(281, 282))
226226

227227
tdSql.query("select * from information_schema.ins_columns where db_name ='performance_schema'")
228228
tdSql.checkEqual(56, len(tdSql.queryResult))

‎tools/keeper/go.mod

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,38 +21,39 @@ require (
2121

2222
require (
2323
github.com/beorn7/perks v1.0.1 // indirect
24-
github.com/bytedance/sonic v1.9.1 // indirect
24+
github.com/bytedance/sonic v1.11.2 // indirect
2525
github.com/cespare/xxhash/v2 v2.1.2 // indirect
26-
github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
26+
github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect
27+
github.com/chenzhuoyu/iasm v0.9.1 // indirect
2728
github.com/davecgh/go-spew v1.1.1 // indirect
2829
github.com/fsnotify/fsnotify v1.5.4 // indirect
29-
github.com/gabriel-vasile/mimetype v1.4.2 // indirect
30-
github.com/gin-contrib/cors v1.3.1 // indirect
30+
github.com/gabriel-vasile/mimetype v1.4.3 // indirect
31+
github.com/gin-contrib/cors v1.6.0 // indirect
3132
github.com/gin-contrib/gzip v0.0.3 // indirect
3233
github.com/gin-contrib/pprof v1.3.0 // indirect
3334
github.com/gin-contrib/sse v0.1.0 // indirect
3435
github.com/go-ole/go-ole v1.2.6 // indirect
3536
github.com/go-playground/locales v0.14.1 // indirect
3637
github.com/go-playground/universal-translator v0.18.1 // indirect
37-
github.com/go-playground/validator/v10 v10.14.0 // indirect
38+
github.com/go-playground/validator/v10 v10.19.0 // indirect
3839
github.com/goccy/go-json v0.10.2 // indirect
3940
github.com/golang/protobuf v1.5.2 // indirect
4041
github.com/google/uuid v1.3.0 // indirect
4142
github.com/gorilla/websocket v1.5.0 // indirect
4243
github.com/hashicorp/hcl v1.0.0 // indirect
4344
github.com/json-iterator/go v1.1.12 // indirect
44-
github.com/klauspost/cpuid/v2 v2.2.4 // indirect
45-
github.com/leodido/go-urn v1.2.4 // indirect
45+
github.com/klauspost/cpuid/v2 v2.2.7 // indirect
46+
github.com/leodido/go-urn v1.4.0 // indirect
4647
github.com/lestrrat-go/strftime v1.0.6 // indirect
4748
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
4849
github.com/magiconair/properties v1.8.6 // indirect
49-
github.com/mattn/go-isatty v0.0.19 // indirect
50+
github.com/mattn/go-isatty v0.0.20 // indirect
5051
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
5152
github.com/mitchellh/mapstructure v1.5.0 // indirect
5253
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
5354
github.com/modern-go/reflect2 v1.0.2 // indirect
5455
github.com/pelletier/go-toml v1.9.5 // indirect
55-
github.com/pelletier/go-toml/v2 v2.0.8 // indirect
56+
github.com/pelletier/go-toml/v2 v2.1.1 // indirect
5657
github.com/pkg/errors v0.9.1 // indirect
5758
github.com/pmezard/go-difflib v1.0.0 // indirect
5859
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
@@ -66,14 +67,14 @@ require (
6667
github.com/tklauser/go-sysconf v0.3.10 // indirect
6768
github.com/tklauser/numcpus v0.4.0 // indirect
6869
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
69-
github.com/ugorji/go/codec v1.2.11 // indirect
70+
github.com/ugorji/go/codec v1.2.12 // indirect
7071
github.com/yusufpapurcu/wmi v1.2.2 // indirect
71-
golang.org/x/arch v0.3.0 // indirect
72-
golang.org/x/crypto v0.9.0 // indirect
73-
golang.org/x/net v0.10.0 // indirect
72+
golang.org/x/arch v0.7.0 // indirect
73+
golang.org/x/crypto v0.21.0 // indirect
74+
golang.org/x/net v0.23.0 // indirect
7475
golang.org/x/sys v0.24.0 // indirect
75-
golang.org/x/text v0.9.0 // indirect
76-
google.golang.org/protobuf v1.30.0 // indirect
76+
golang.org/x/text v0.14.0 // indirect
77+
google.golang.org/protobuf v1.33.0 // indirect
7778
gopkg.in/ini.v1 v1.66.4 // indirect
7879
gopkg.in/yaml.v2 v2.4.0 // indirect
7980
gopkg.in/yaml.v3 v3.0.1 // indirect

0 commit comments

Comments
 (0)