Merge branch '3.0' of github.com:taosdata/TDengine into szhou/fix/udf
This commit is contained in:
slzhou@taodata.com
commit
46974a9dfc
|
|
@ -368,36 +368,6 @@ charset 的有效值是 UTF-8。
|
||||||
| 缺省值 | -1 |
|
| 缺省值 | -1 |
|
||||||
| 补充说明 | 2.3.0.0 版本新增。 |
|
| 补充说明 | 2.3.0.0 版本新增。 |
|
||||||
|
|
||||||
### lossyColumns
|
|
||||||
|
|
||||||
| 属性 | 说明 |
|
|
||||||
| -------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------ |
|
|
||||||
| 适用范围 | 服务器端 |
|
|
||||||
| 含义 | 配置要进行有损压缩的浮点数据类型 |
|
|
||||||
| 取值范围 | 空字符串：关闭有损压缩 <br/> float：只对 float 类型进行有损压缩 <br/>double：只对 double 类型进行有损压缩 <br/> float \| double：float double 都进行有损压缩 |
|
|
||||||
| 缺省值 | 空字符串 |
|
|
||||||
| 补充说明 | 有损压缩默认为关闭状态，只有配置后才生效 |
|
|
||||||
|
|
||||||
### fPrecision
|
|
||||||
|
|
||||||
| 属性 | 说明 |
|
|
||||||
| -------- | -------------------------------- |
|
|
||||||
| 适用范围 | 服务器端 |
|
|
||||||
| 含义 | 设置 float 类型浮点数压缩精度 |
|
|
||||||
| 取值范围 | 0.1 ~ 0.00000001 |
|
|
||||||
| 缺省值 | 0.00000001 |
|
|
||||||
| 补充说明 | 小于此值的浮点数尾数部分将被截取 |
|
|
||||||
|
|
||||||
### dPrecision
|
|
||||||
|
|
||||||
| 属性 | 说明 |
|
|
||||||
| -------- | -------------------------------- |
|
|
||||||
| 适用范围 | 服务器端 |
|
|
||||||
| 含义 | 设置 double 类型浮点数压缩精度 |
|
|
||||||
| 取值范围 | 0.1 ~ 0.0000000000000001 |
|
|
||||||
| 缺省值 | 0.0000000000000001 |
|
|
||||||
| 补充说明 | 小于此值的浮点数尾数部分将被截取 |
|
|
||||||
|
|
||||||
## 日志相关
|
## 日志相关
|
||||||
|
|
||||||
### logDir
|
### logDir
|
||||||
|
|
@ -453,50 +423,23 @@ charset 的有效值是 UTF-8。
|
||||||
| 取值范围 | 131（输出错误和警告日志），135（输出错误、警告和调试日志），143（输出错误、警告、调试和跟踪日志） |
|
| 取值范围 | 131（输出错误和警告日志），135（输出错误、警告和调试日志），143（输出错误、警告、调试和跟踪日志） |
|
||||||
| 缺省值 | 131 或 135（不同模块有不同的默认值） |
|
| 缺省值 | 131 或 135（不同模块有不同的默认值） |
|
||||||
|
|
||||||
### mDebugFlag
|
### tmrDebugFlag
|
||||||
|
|
||||||
| 属性 | 说明 |
|
|
||||||
| -------- | ------------------ |
|
|
||||||
| 适用范围 | 仅服务端适用 |
|
|
||||||
| 含义 | 管理模块的日志开关 |
|
|
||||||
| 取值范围 | 同上 |
|
|
||||||
| 缺省值 | 135 |
|
|
||||||
|
|
||||||
### dDebugFlag
|
|
||||||
|
|
||||||
| 属性 | 说明 |
|
| 属性 | 说明 |
|
||||||
| -------- | -------------------- |
|
| -------- | -------------------- |
|
||||||
| 适用范围 | 服务端和客户端均适用 |
|
| 适用范围 | 服务端和客户端均适用 |
|
||||||
| 含义 | dnode 模块的日志开关 |
|
| 含义 | 定时器模块的日志开关 |
|
||||||
| 取值范围 | 同上 |
|
| 取值范围 | 同上 |
|
||||||
| 缺省值 | 135 |
|
| 缺省值 | |
|
||||||
|
|
||||||
### sDebugFlag
|
### uDebugFlag
|
||||||
|
|
||||||
| 属性 | 说明 |
|
| 属性 | 说明 |
|
||||||
| -------- | -------------------- |
|
| -------- | ---------------------- |
|
||||||
| 适用范围 | 服务端和客户端均适用 |
|
| 适用范围 | 服务端和客户端均适用 |
|
||||||
| 含义 | sync 模块的日志开关 |
|
| 含义 | 共用功能模块的日志开关 |
|
||||||
| 取值范围 | 同上 |
|
| 取值范围 | 同上 |
|
||||||
| 缺省值 | 135 |
|
| 缺省值 | |
|
||||||
|
|
||||||
### wDebugFlag
|
|
||||||
|
|
||||||
| 属性 | 说明 |
|
|
||||||
| -------- | -------------------- |
|
|
||||||
| 适用范围 | 服务端和客户端均适用 |
|
|
||||||
| 含义 | WAL 模块的日志开关 |
|
|
||||||
| 取值范围 | 同上 |
|
|
||||||
| 缺省值 | 135 |
|
|
||||||
|
|
||||||
### sdbDebugFlag
|
|
||||||
|
|
||||||
| 属性 | 说明 |
|
|
||||||
| -------- | -------------------- |
|
|
||||||
| 适用范围 | 服务端和客户端均适用 |
|
|
||||||
| 含义 | sdb 模块的日志开关 |
|
|
||||||
| 取值范围 | 同上 |
|
|
||||||
| 缺省值 | 135 |
|
|
||||||
|
|
||||||
### rpcDebugFlag
|
### rpcDebugFlag
|
||||||
|
|
||||||
|
|
@ -507,12 +450,21 @@ charset 的有效值是 UTF-8。
|
||||||
| 取值范围 | 同上 |
|
| 取值范围 | 同上 |
|
||||||
| 缺省值 | |
|
| 缺省值 | |
|
||||||
|
|
||||||
### tmrDebugFlag
|
### jniDebugFlag
|
||||||
|
|
||||||
|
| 属性 | 说明 |
|
||||||
|
| -------- | ------------------ |
|
||||||
|
| 适用范围 | 仅客户端适用 |
|
||||||
|
| 含义 | jni 模块的日志开关 |
|
||||||
|
| 取值范围 | 同上 |
|
||||||
|
| 缺省值 | |
|
||||||
|
|
||||||
|
### qDebugFlag
|
||||||
|
|
||||||
| 属性 | 说明 |
|
| 属性 | 说明 |
|
||||||
| -------- | -------------------- |
|
| -------- | -------------------- |
|
||||||
| 适用范围 | 服务端和客户端均适用 |
|
| 适用范围 | 服务端和客户端均适用 |
|
||||||
| 含义 | 定时器模块的日志开关 |
|
| 含义 | query 模块的日志开关 |
|
||||||
| 取值范围 | 同上 |
|
| 取值范围 | 同上 |
|
||||||
| 缺省值 | |
|
| 缺省值 | |
|
||||||
|
|
||||||
|
|
@ -525,158 +477,114 @@ charset 的有效值是 UTF-8。
|
||||||
| 取值范围 | 同上 |
|
| 取值范围 | 同上 |
|
||||||
| 缺省值 | |
|
| 缺省值 | |
|
||||||
|
|
||||||
### jniDebugFlag
|
### dDebugFlag
|
||||||
|
|
||||||
| 属性 | 说明 |
|
|
||||||
| -------- | ------------------ |
|
|
||||||
| 适用范围 | 仅客户端适用 |
|
|
||||||
| 含义 | jni 模块的日志开关 |
|
|
||||||
| 取值范围 | 同上 |
|
|
||||||
| 缺省值 | |
|
|
||||||
|
|
||||||
### odbcDebugFlag
|
|
||||||
|
|
||||||
| 属性 | 说明 |
|
|
||||||
| -------- | ------------------- |
|
|
||||||
| 适用范围 | 仅客户端适用 |
|
|
||||||
| 含义 | odbc 模块的日志开关 |
|
|
||||||
| 取值范围 | 同上 |
|
|
||||||
| 缺省值 | |
|
|
||||||
|
|
||||||
### uDebugFlag
|
|
||||||
|
|
||||||
| 属性 | 说明 |
|
|
||||||
| -------- | ---------------------- |
|
|
||||||
| 适用范围 | 服务端和客户端均适用 |
|
|
||||||
| 含义 | 共用功能模块的日志开关 |
|
|
||||||
| 取值范围 | 同上 |
|
|
||||||
| 缺省值 | |
|
|
||||||
|
|
||||||
### httpDebugFlag
|
|
||||||
|
|
||||||
| 属性 | 说明 |
|
|
||||||
| -------- | ------------------- |
|
|
||||||
| 适用范围 | 仅服务端适用 |
|
|
||||||
| 含义 | http 模块的日志开关 |
|
|
||||||
| 取值范围 | 同上 |
|
|
||||||
| 缺省值 | |
|
|
||||||
|
|
||||||
### mqttDebugFlag
|
|
||||||
|
|
||||||
| 属性 | 说明 |
|
|
||||||
| -------- | ------------------- |
|
|
||||||
| 适用范围 | 仅服务端适用 |
|
|
||||||
| 含义 | mqtt 模块的日志开关 |
|
|
||||||
| 取值范围 | 同上 |
|
|
||||||
| 缺省值 | |
|
|
||||||
|
|
||||||
### monitorDebugFlag
|
|
||||||
|
|
||||||
| 属性 | 说明 |
|
|
||||||
| -------- | ------------------ |
|
|
||||||
| 适用范围 | 仅服务端适用 |
|
|
||||||
| 含义 | 监控模块的日志开关 |
|
|
||||||
| 取值范围 | 同上 |
|
|
||||||
| 缺省值 | |
|
|
||||||
|
|
||||||
### qDebugFlag
|
|
||||||
|
|
||||||
| 属性 | 说明 |
|
| 属性 | 说明 |
|
||||||
| -------- | -------------------- |
|
| -------- | -------------------- |
|
||||||
| 适用范围 | 服务端和客户端均适用 |
|
| 适用范围 | 仅服务端适用 |
|
||||||
| 含义 | 查询模块的日志开关 |
|
| 含义 | dnode 模块的日志开关 |
|
||||||
| 取值范围 | 同上 |
|
| 取值范围 | 同上 |
|
||||||
| 缺省值 | |
|
| 缺省值 | 135 |
|
||||||
|
|
||||||
### vDebugFlag
|
### vDebugFlag
|
||||||
|
|
||||||
| 属性 | 说明 |
|
| 属性 | 说明 |
|
||||||
| -------- | -------------------- |
|
| -------- | -------------------- |
|
||||||
| 适用范围 | 服务端和客户端均适用 |
|
| 适用范围 | 仅服务端适用 |
|
||||||
| 含义 | vnode 模块的日志开关 |
|
| 含义 | vnode 模块的日志开关 |
|
||||||
| 取值范围 | 同上 |
|
| 取值范围 | 同上 |
|
||||||
| 缺省值 | |
|
| 缺省值 | |
|
||||||
|
|
||||||
|
### mDebugFlag
|
||||||
|
|
||||||
|
| 属性 | 说明 |
|
||||||
|
| -------- | ------------------ |
|
||||||
|
| 适用范围 | 仅服务端适用 |
|
||||||
|
| 含义 | mnode 模块的日志开关 |
|
||||||
|
| 取值范围 | 同上 |
|
||||||
|
| 缺省值 | 135 |
|
||||||
|
|
||||||
|
### wDebugFlag
|
||||||
|
|
||||||
|
| 属性 | 说明 |
|
||||||
|
| -------- | -------------------- |
|
||||||
|
| 适用范围 | 仅服务端适用 |
|
||||||
|
| 含义 | wal 模块的日志开关 |
|
||||||
|
| 取值范围 | 同上 |
|
||||||
|
| 缺省值 | 135 |
|
||||||
|
|
||||||
|
### sDebugFlag
|
||||||
|
|
||||||
|
| 属性 | 说明 |
|
||||||
|
| -------- | -------------------- |
|
||||||
|
| 适用范围 | 服务端和客户端均适用 |
|
||||||
|
| 含义 | sync 模块的日志开关 |
|
||||||
|
| 取值范围 | 同上 |
|
||||||
|
| 缺省值 | 135 |
|
||||||
|
|
||||||
### tsdbDebugFlag
|
### tsdbDebugFlag
|
||||||
|
|
||||||
| 属性 | 说明 |
|
| 属性 | 说明 |
|
||||||
| -------- | ------------------- |
|
| -------- | ------------------- |
|
||||||
| 适用范围 | 仅服务端适用 |
|
| 适用范围 | 仅服务端适用 |
|
||||||
| 含义 | TSDB 模块的日志开关 |
|
| 含义 | tsdb 模块的日志开关 |
|
||||||
| 取值范围 | 同上 |
|
| 取值范围 | 同上 |
|
||||||
| 缺省值 | |
|
| 缺省值 | |
|
||||||
|
|
||||||
### cqDebugFlag
|
### tqDebugFlag
|
||||||
|
|
||||||
|
| 属性 | 说明 |
|
||||||
|
| -------- | ------------------- |
|
||||||
|
| 适用范围 | 仅服务端适用 |
|
||||||
|
| 含义 | tq 模块的日志开关 |
|
||||||
|
| 取值范围 | 同上 |
|
||||||
|
| 缺省值 | |
|
||||||
|
|
||||||
|
### fsDebugFlag
|
||||||
|
|
||||||
|
| 属性 | 说明 |
|
||||||
|
| -------- | ------------------- |
|
||||||
|
| 适用范围 | 仅服务端适用 |
|
||||||
|
| 含义 | fs 模块的日志开关 |
|
||||||
|
| 取值范围 | 同上 |
|
||||||
|
| 缺省值 | |
|
||||||
|
|
||||||
|
### udfDebugFlag
|
||||||
|
|
||||||
| 属性 | 说明 |
|
| 属性 | 说明 |
|
||||||
| -------- | ---------------------- |
|
| -------- | ---------------------- |
|
||||||
| 适用范围 | 服务端和客户端均适用 |
|
| 适用范围 | 仅服务端适用 |
|
||||||
| 含义 | 连续查询模块的日志开关 |
|
| 含义 | UDF 模块的日志开关 |
|
||||||
|
| 取值范围 | 同上 |
|
||||||
|
| 缺省值 | |
|
||||||
|
|
||||||
|
### smaDebugFlag
|
||||||
|
|
||||||
|
| 属性 | 说明 |
|
||||||
|
| -------- | ---------------------- |
|
||||||
|
| 适用范围 | 仅服务端适用 |
|
||||||
|
| 含义 | sma 模块的日志开关 |
|
||||||
|
| 取值范围 | 同上 |
|
||||||
|
| 缺省值 | |
|
||||||
|
|
||||||
|
### idxDebugFlag
|
||||||
|
|
||||||
|
| 属性 | 说明 |
|
||||||
|
| -------- | ---------------------- |
|
||||||
|
| 适用范围 | 仅服务端适用 |
|
||||||
|
| 含义 | index 模块的日志开关 |
|
||||||
|
| 取值范围 | 同上 |
|
||||||
|
| 缺省值 | |
|
||||||
|
|
||||||
|
### tdbDebugFlag
|
||||||
|
|
||||||
|
| 属性 | 说明 |
|
||||||
|
| -------- | ---------------------- |
|
||||||
|
| 适用范围 | 仅服务端适用 |
|
||||||
|
| 含义 | tdb 模块的日志开关 |
|
||||||
| 取值范围 | 同上 |
|
| 取值范围 | 同上 |
|
||||||
| 缺省值 | |
|
| 缺省值 | |
|
||||||
|
|
||||||
## 仅客户端适用
|
|
||||||
|
|
||||||
### maxSQLLength
|
|
||||||
|
|
||||||
| 属性 | 说明 |
|
|
||||||
| -------- | --------------------------- |
|
|
||||||
| 适用范围 | 仅客户端适用 |
|
|
||||||
| 含义 | 单条 SQL 语句允许的最长限制 |
|
|
||||||
| 单位 | bytes |
|
|
||||||
| 取值范围 | 65480-1048576 |
|
|
||||||
| 缺省值 | 1048576 |
|
|
||||||
|
|
||||||
### tscEnableRecordSql
|
|
||||||
|
|
||||||
| 属性 | 说明 |
|
|
||||||
| -------- | ----------------------------------------------------------------------------------- |
|
|
||||||
| 含义 | 是否记录客户端 sql 语句到文件 |
|
|
||||||
| 取值范围 | 0：否，1：是 |
|
|
||||||
| 缺省值 | 0 |
|
|
||||||
| 补充说明 | 生成的文件（tscnote-xxxx.0/tscnote-xxx.1，xxxx 是 pid），与客户端日志所在目录相同。 |
|
|
||||||
|
|
||||||
### maxBinaryDisplayWidth
|
|
||||||
|
|
||||||
| 属性 | 说明 |
|
|
||||||
| -------- | -------------------------------------------------------------------------- |
|
|
||||||
| 含义 | Taos shell 中 binary 和 nchar 字段的显示宽度上限，超过此限制的部分将被隐藏 |
|
|
||||||
| 取值范围 | 5 - |
|
|
||||||
| 缺省值 | 30 |
|
|
||||||
|
|
||||||
:::info
|
|
||||||
实际上限按以下规则计算：如果字段值的长度大于 maxBinaryDisplayWidth，则显示上限为 **字段名长度** 和 **maxBinaryDisplayWidth** 的较大者。<br/>否则，上限为 **字段名长度** 和 **字段值长度** 的较大者。<br/>可在 shell 中通过命令 set max_binary_display_width nn 动态修改此选项
|
|
||||||
|
|
||||||
:::
|
|
||||||
|
|
||||||
### maxWildCardsLength
|
|
||||||
|
|
||||||
| 属性 | 说明 |
|
|
||||||
| -------- | ------------------------------------------ |
|
|
||||||
| 含义 | 设定 LIKE 算子的通配符字符串允许的最大长度 |
|
|
||||||
| 单位 | bytes |
|
|
||||||
| 取值范围 | 0-16384 |
|
|
||||||
| 缺省值 | 100 |
|
|
||||||
| 补充说明 | 2.1.6.1 版本新增。 |
|
|
||||||
|
|
||||||
### clientMerge
|
|
||||||
|
|
||||||
| 属性 | 说明 |
|
|
||||||
| -------- | ---------------------------- |
|
|
||||||
| 含义 | 是否允许客户端对写入数据去重 |
|
|
||||||
| 取值范围 | 0：不开启，1：开启 |
|
|
||||||
| 缺省值 | 0 |
|
|
||||||
| 补充说明 | 2.3 版本新增。 |
|
|
||||||
|
|
||||||
### maxRegexStringLen
|
|
||||||
|
|
||||||
| 属性 | 说明 |
|
|
||||||
| -------- | -------------------------- |
|
|
||||||
| 含义 | 正则表达式最大允许长度 |
|
|
||||||
| 取值范围 | 默认值 128，最大长度 16384 |
|
|
||||||
| 缺省值 | 128 |
|
|
||||||
| 补充说明 | 2.3 版本新增。 |
|
|
||||||
|
|
||||||
## 其他
|
## 其他
|
||||||
|
|
||||||
### enableCoreFile
|
### enableCoreFile
|
||||||
|
|
|
||||||
|
|
@ -41,10 +41,8 @@ extern int32_t tsCompressMsgSize;
|
||||||
extern int32_t tsCompressColData;
|
extern int32_t tsCompressColData;
|
||||||
extern int32_t tsMaxNumOfDistinctResults;
|
extern int32_t tsMaxNumOfDistinctResults;
|
||||||
extern int32_t tsCompatibleModel;
|
extern int32_t tsCompatibleModel;
|
||||||
extern bool tsEnableSlaveQuery;
|
|
||||||
extern bool tsPrintAuth;
|
extern bool tsPrintAuth;
|
||||||
extern int64_t tsTickPerMin[3];
|
extern int64_t tsTickPerMin[3];
|
||||||
|
|
||||||
extern int32_t tsCountAlwaysReturnValue;
|
extern int32_t tsCountAlwaysReturnValue;
|
||||||
|
|
||||||
// multi-process
|
// multi-process
|
||||||
|
|
@ -92,8 +90,6 @@ extern uint16_t tsTelemPort;
|
||||||
extern int32_t tsQueryBufferSize; // maximum allowed usage buffer size in MB for each data node during query processing
|
extern int32_t tsQueryBufferSize; // maximum allowed usage buffer size in MB for each data node during query processing
|
||||||
extern int64_t tsQueryBufferSizeBytes; // maximum allowed usage buffer size in byte for each data node
|
extern int64_t tsQueryBufferSizeBytes; // maximum allowed usage buffer size in byte for each data node
|
||||||
extern bool tsRetrieveBlockingModel; // retrieve threads will be blocked
|
extern bool tsRetrieveBlockingModel; // retrieve threads will be blocked
|
||||||
extern bool tsKeepOriginalColumnName;
|
|
||||||
extern bool tsDeadLockKillQuery;
|
|
||||||
|
|
||||||
// query client
|
// query client
|
||||||
extern int32_t tsQueryPolicy;
|
extern int32_t tsQueryPolicy;
|
||||||
|
|
|
||||||
|
|
@ -35,7 +35,6 @@ int32_t tsNumOfSupportVnodes = 256;
|
||||||
// common
|
// common
|
||||||
int32_t tsMaxShellConns = 50000;
|
int32_t tsMaxShellConns = 50000;
|
||||||
int32_t tsShellActivityTimer = 3; // second
|
int32_t tsShellActivityTimer = 3; // second
|
||||||
bool tsEnableSlaveQuery = true;
|
|
||||||
bool tsPrintAuth = false;
|
bool tsPrintAuth = false;
|
||||||
|
|
||||||
// multi process
|
// multi process
|
||||||
|
|
@ -128,12 +127,6 @@ int64_t tsQueryBufferSizeBytes = -1;
|
||||||
// in retrieve blocking model, the retrieve threads will wait for the completion of the query processing.
|
// in retrieve blocking model, the retrieve threads will wait for the completion of the query processing.
|
||||||
bool tsRetrieveBlockingModel = false;
|
bool tsRetrieveBlockingModel = false;
|
||||||
|
|
||||||
// last_row(*), first(*), last_row(ts, col1, col2) query, the result fields will be the original column name
|
|
||||||
bool tsKeepOriginalColumnName = false;
|
|
||||||
|
|
||||||
// kill long query
|
|
||||||
bool tsDeadLockKillQuery = false;
|
|
||||||
|
|
||||||
// tsdb config
|
// tsdb config
|
||||||
// For backward compatibility
|
// For backward compatibility
|
||||||
bool tsdbForceKeepFile = false;
|
bool tsdbForceKeepFile = false;
|
||||||
|
|
@ -320,7 +313,6 @@ static int32_t taosAddClientCfg(SConfig *pCfg) {
|
||||||
if (cfgAddInt32(pCfg, "shellActivityTimer", tsShellActivityTimer, 1, 120, 1) != 0) return -1;
|
if (cfgAddInt32(pCfg, "shellActivityTimer", tsShellActivityTimer, 1, 120, 1) != 0) return -1;
|
||||||
if (cfgAddInt32(pCfg, "compressMsgSize", tsCompressMsgSize, -1, 100000000, 1) != 0) return -1;
|
if (cfgAddInt32(pCfg, "compressMsgSize", tsCompressMsgSize, -1, 100000000, 1) != 0) return -1;
|
||||||
if (cfgAddInt32(pCfg, "compressColData", tsCompressColData, -1, 100000000, 1) != 0) return -1;
|
if (cfgAddInt32(pCfg, "compressColData", tsCompressColData, -1, 100000000, 1) != 0) return -1;
|
||||||
if (cfgAddBool(pCfg, "keepColumnName", tsKeepOriginalColumnName, 1) != 0) return -1;
|
|
||||||
if (cfgAddInt32(pCfg, "queryPolicy", tsQueryPolicy, 1, 3, 1) != 0) return -1;
|
if (cfgAddInt32(pCfg, "queryPolicy", tsQueryPolicy, 1, 3, 1) != 0) return -1;
|
||||||
if (cfgAddInt32(pCfg, "querySmaOptimize", tsQuerySmaOptimize, 0, 1, 1) != 0) return -1;
|
if (cfgAddInt32(pCfg, "querySmaOptimize", tsQuerySmaOptimize, 0, 1, 1) != 0) return -1;
|
||||||
if (cfgAddString(pCfg, "smlChildTableName", "", 1) != 0) return -1;
|
if (cfgAddString(pCfg, "smlChildTableName", "", 1) != 0) return -1;
|
||||||
|
|
@ -372,8 +364,6 @@ static int32_t taosAddServerCfg(SConfig *pCfg) {
|
||||||
if (cfgAddInt32(pCfg, "queryBufferSize", tsQueryBufferSize, -1, 500000000000, 0) != 0) return -1;
|
if (cfgAddInt32(pCfg, "queryBufferSize", tsQueryBufferSize, -1, 500000000000, 0) != 0) return -1;
|
||||||
if (cfgAddBool(pCfg, "retrieveBlockingModel", tsRetrieveBlockingModel, 0) != 0) return -1;
|
if (cfgAddBool(pCfg, "retrieveBlockingModel", tsRetrieveBlockingModel, 0) != 0) return -1;
|
||||||
if (cfgAddBool(pCfg, "printAuth", tsPrintAuth, 0) != 0) return -1;
|
if (cfgAddBool(pCfg, "printAuth", tsPrintAuth, 0) != 0) return -1;
|
||||||
if (cfgAddBool(pCfg, "slaveQuery", tsEnableSlaveQuery, 0) != 0) return -1;
|
|
||||||
if (cfgAddBool(pCfg, "deadLockKillQuery", tsDeadLockKillQuery, 0) != 0) return -1;
|
|
||||||
|
|
||||||
if (cfgAddInt32(pCfg, "multiProcess", tsMultiProcess, 0, 2, 0) != 0) return -1;
|
if (cfgAddInt32(pCfg, "multiProcess", tsMultiProcess, 0, 2, 0) != 0) return -1;
|
||||||
if (cfgAddInt32(pCfg, "mnodeShmSize", tsMnodeShmSize, TSDB_MAX_MSG_SIZE * 2 + 1024, INT32_MAX, 0) != 0) return -1;
|
if (cfgAddInt32(pCfg, "mnodeShmSize", tsMnodeShmSize, TSDB_MAX_MSG_SIZE * 2 + 1024, INT32_MAX, 0) != 0) return -1;
|
||||||
|
|
@ -381,7 +371,7 @@ static int32_t taosAddServerCfg(SConfig *pCfg) {
|
||||||
if (cfgAddInt32(pCfg, "qnodeShmSize", tsQnodeShmSize, TSDB_MAX_MSG_SIZE * 2 + 1024, INT32_MAX, 0) != 0) return -1;
|
if (cfgAddInt32(pCfg, "qnodeShmSize", tsQnodeShmSize, TSDB_MAX_MSG_SIZE * 2 + 1024, INT32_MAX, 0) != 0) return -1;
|
||||||
if (cfgAddInt32(pCfg, "snodeShmSize", tsSnodeShmSize, TSDB_MAX_MSG_SIZE * 2 + 1024, INT32_MAX, 0) != 0) return -1;
|
if (cfgAddInt32(pCfg, "snodeShmSize", tsSnodeShmSize, TSDB_MAX_MSG_SIZE * 2 + 1024, INT32_MAX, 0) != 0) return -1;
|
||||||
if (cfgAddInt32(pCfg, "bnodeShmSize", tsBnodeShmSize, TSDB_MAX_MSG_SIZE * 2 + 1024, INT32_MAX, 0) != 0) return -1;
|
if (cfgAddInt32(pCfg, "bnodeShmSize", tsBnodeShmSize, TSDB_MAX_MSG_SIZE * 2 + 1024, INT32_MAX, 0) != 0) return -1;
|
||||||
if (cfgAddInt32(pCfg, "mumOfShmThreads", tsNumOfShmThreads, 1, 1024, 0) != 0) return -1;
|
if (cfgAddInt32(pCfg, "numOfShmThreads", tsNumOfShmThreads, 1, 1024, 0) != 0) return -1;
|
||||||
|
|
||||||
tsNumOfRpcThreads = tsNumOfCores / 2;
|
tsNumOfRpcThreads = tsNumOfCores / 2;
|
||||||
tsNumOfRpcThreads = TRANGE(tsNumOfRpcThreads, 1, 4);
|
tsNumOfRpcThreads = TRANGE(tsNumOfRpcThreads, 1, 4);
|
||||||
|
|
@ -391,25 +381,21 @@ static int32_t taosAddServerCfg(SConfig *pCfg) {
|
||||||
tsNumOfCommitThreads = TRANGE(tsNumOfCommitThreads, 2, 4);
|
tsNumOfCommitThreads = TRANGE(tsNumOfCommitThreads, 2, 4);
|
||||||
if (cfgAddInt32(pCfg, "numOfCommitThreads", tsNumOfCommitThreads, 1, 1024, 0) != 0) return -1;
|
if (cfgAddInt32(pCfg, "numOfCommitThreads", tsNumOfCommitThreads, 1, 1024, 0) != 0) return -1;
|
||||||
|
|
||||||
tsNumOfMnodeQueryThreads = tsNumOfCores * 2;
|
|
||||||
tsNumOfMnodeQueryThreads = TRANGE(tsNumOfMnodeQueryThreads, 4, 8);
|
|
||||||
if (cfgAddInt32(pCfg, "numOfMnodeQueryThreads", tsNumOfMnodeQueryThreads, 1, 1024, 0) != 0) return -1;
|
|
||||||
|
|
||||||
tsNumOfMnodeReadThreads = tsNumOfCores / 8;
|
tsNumOfMnodeReadThreads = tsNumOfCores / 8;
|
||||||
tsNumOfMnodeReadThreads = TRANGE(tsNumOfMnodeReadThreads, 1, 4);
|
tsNumOfMnodeReadThreads = TRANGE(tsNumOfMnodeReadThreads, 1, 4);
|
||||||
if (cfgAddInt32(pCfg, "numOfMnodeReadThreads", tsNumOfMnodeReadThreads, 1, 1024, 0) != 0) return -1;
|
if (cfgAddInt32(pCfg, "numOfMnodeReadThreads", tsNumOfMnodeReadThreads, 1, 1024, 0) != 0) return -1;
|
||||||
|
|
||||||
tsNumOfVnodeQueryThreads = tsNumOfCores * 2;
|
tsNumOfVnodeQueryThreads = tsNumOfCores * 2;
|
||||||
tsNumOfVnodeQueryThreads = TMAX(tsNumOfVnodeQueryThreads, 4);
|
tsNumOfVnodeQueryThreads = TMAX(tsNumOfVnodeQueryThreads, 4);
|
||||||
if (cfgAddInt32(pCfg, "numOfVnodeQueryThreads", tsNumOfVnodeQueryThreads, 1, 1024, 0) != 0) return -1;
|
if (cfgAddInt32(pCfg, "numOfVnodeQueryThreads", tsNumOfVnodeQueryThreads, 4, 1024, 0) != 0) return -1;
|
||||||
|
|
||||||
tsNumOfVnodeStreamThreads = tsNumOfCores / 4;
|
tsNumOfVnodeStreamThreads = tsNumOfCores / 4;
|
||||||
tsNumOfVnodeStreamThreads = TMAX(tsNumOfVnodeStreamThreads, 4);
|
tsNumOfVnodeStreamThreads = TMAX(tsNumOfVnodeStreamThreads, 4);
|
||||||
if (cfgAddInt32(pCfg, "numOfVnodeStreamThreads", tsNumOfVnodeStreamThreads, 1, 1024, 0) != 0) return -1;
|
if (cfgAddInt32(pCfg, "numOfVnodeStreamThreads", tsNumOfVnodeStreamThreads, 4, 1024, 0) != 0) return -1;
|
||||||
|
|
||||||
tsNumOfVnodeFetchThreads = tsNumOfCores / 4;
|
tsNumOfVnodeFetchThreads = tsNumOfCores / 4;
|
||||||
tsNumOfVnodeFetchThreads = TMAX(tsNumOfVnodeFetchThreads, 4);
|
tsNumOfVnodeFetchThreads = TMAX(tsNumOfVnodeFetchThreads, 4);
|
||||||
if (cfgAddInt32(pCfg, "numOfVnodeFetchThreads", tsNumOfVnodeFetchThreads, 1, 1024, 0) != 0) return -1;
|
if (cfgAddInt32(pCfg, "numOfVnodeFetchThreads", tsNumOfVnodeFetchThreads, 4, 1024, 0) != 0) return -1;
|
||||||
|
|
||||||
tsNumOfVnodeWriteThreads = tsNumOfCores;
|
tsNumOfVnodeWriteThreads = tsNumOfCores;
|
||||||
tsNumOfVnodeWriteThreads = TMAX(tsNumOfVnodeWriteThreads, 1);
|
tsNumOfVnodeWriteThreads = TMAX(tsNumOfVnodeWriteThreads, 1);
|
||||||
|
|
@ -429,11 +415,11 @@ static int32_t taosAddServerCfg(SConfig *pCfg) {
|
||||||
|
|
||||||
tsNumOfSnodeSharedThreads = tsNumOfCores / 4;
|
tsNumOfSnodeSharedThreads = tsNumOfCores / 4;
|
||||||
tsNumOfSnodeSharedThreads = TRANGE(tsNumOfSnodeSharedThreads, 2, 4);
|
tsNumOfSnodeSharedThreads = TRANGE(tsNumOfSnodeSharedThreads, 2, 4);
|
||||||
if (cfgAddInt32(pCfg, "numOfSnodeSharedThreads", tsNumOfSnodeSharedThreads, 1, 1024, 0) != 0) return -1;
|
if (cfgAddInt32(pCfg, "numOfSnodeSharedThreads", tsNumOfSnodeSharedThreads, 2, 1024, 0) != 0) return -1;
|
||||||
|
|
||||||
tsNumOfSnodeUniqueThreads = tsNumOfCores / 4;
|
tsNumOfSnodeUniqueThreads = tsNumOfCores / 4;
|
||||||
tsNumOfSnodeUniqueThreads = TRANGE(tsNumOfSnodeUniqueThreads, 2, 4);
|
tsNumOfSnodeUniqueThreads = TRANGE(tsNumOfSnodeUniqueThreads, 2, 4);
|
||||||
if (cfgAddInt32(pCfg, "numOfSnodeUniqueThreads", tsNumOfSnodeUniqueThreads, 1, 1024, 0) != 0) return -1;
|
if (cfgAddInt32(pCfg, "numOfSnodeUniqueThreads", tsNumOfSnodeUniqueThreads, 2, 1024, 0) != 0) return -1;
|
||||||
|
|
||||||
tsRpcQueueMemoryAllowed = tsTotalMemoryKB * 1024 * 0.1;
|
tsRpcQueueMemoryAllowed = tsTotalMemoryKB * 1024 * 0.1;
|
||||||
tsRpcQueueMemoryAllowed = TRANGE(tsRpcQueueMemoryAllowed, TSDB_MAX_MSG_SIZE * 10L, TSDB_MAX_MSG_SIZE * 10000L);
|
tsRpcQueueMemoryAllowed = TRANGE(tsRpcQueueMemoryAllowed, TSDB_MAX_MSG_SIZE * 10L, TSDB_MAX_MSG_SIZE * 10000L);
|
||||||
|
|
@ -527,7 +513,6 @@ static int32_t taosSetClientCfg(SConfig *pCfg) {
|
||||||
tsShellActivityTimer = cfgGetItem(pCfg, "shellActivityTimer")->i32;
|
tsShellActivityTimer = cfgGetItem(pCfg, "shellActivityTimer")->i32;
|
||||||
tsCompressMsgSize = cfgGetItem(pCfg, "compressMsgSize")->i32;
|
tsCompressMsgSize = cfgGetItem(pCfg, "compressMsgSize")->i32;
|
||||||
tsCompressColData = cfgGetItem(pCfg, "compressColData")->i32;
|
tsCompressColData = cfgGetItem(pCfg, "compressColData")->i32;
|
||||||
tsKeepOriginalColumnName = cfgGetItem(pCfg, "keepColumnName")->bval;
|
|
||||||
tsNumOfTaskQueueThreads = cfgGetItem(pCfg, "numOfTaskQueueThreads")->i32;
|
tsNumOfTaskQueueThreads = cfgGetItem(pCfg, "numOfTaskQueueThreads")->i32;
|
||||||
tsQueryPolicy = cfgGetItem(pCfg, "queryPolicy")->i32;
|
tsQueryPolicy = cfgGetItem(pCfg, "queryPolicy")->i32;
|
||||||
tsQuerySmaOptimize = cfgGetItem(pCfg, "querySmaOptimize")->i32;
|
tsQuerySmaOptimize = cfgGetItem(pCfg, "querySmaOptimize")->i32;
|
||||||
|
|
@ -564,8 +549,6 @@ static int32_t taosSetServerCfg(SConfig *pCfg) {
|
||||||
tsQueryBufferSize = cfgGetItem(pCfg, "queryBufferSize")->i32;
|
tsQueryBufferSize = cfgGetItem(pCfg, "queryBufferSize")->i32;
|
||||||
tsRetrieveBlockingModel = cfgGetItem(pCfg, "retrieveBlockingModel")->bval;
|
tsRetrieveBlockingModel = cfgGetItem(pCfg, "retrieveBlockingModel")->bval;
|
||||||
tsPrintAuth = cfgGetItem(pCfg, "printAuth")->bval;
|
tsPrintAuth = cfgGetItem(pCfg, "printAuth")->bval;
|
||||||
tsEnableSlaveQuery = cfgGetItem(pCfg, "slaveQuery")->bval;
|
|
||||||
tsDeadLockKillQuery = cfgGetItem(pCfg, "deadLockKillQuery")->i32;
|
|
||||||
|
|
||||||
tsMultiProcess = cfgGetItem(pCfg, "multiProcess")->bval;
|
tsMultiProcess = cfgGetItem(pCfg, "multiProcess")->bval;
|
||||||
tsMnodeShmSize = cfgGetItem(pCfg, "mnodeShmSize")->i32;
|
tsMnodeShmSize = cfgGetItem(pCfg, "mnodeShmSize")->i32;
|
||||||
|
|
@ -576,7 +559,6 @@ static int32_t taosSetServerCfg(SConfig *pCfg) {
|
||||||
|
|
||||||
tsNumOfRpcThreads = cfgGetItem(pCfg, "numOfRpcThreads")->i32;
|
tsNumOfRpcThreads = cfgGetItem(pCfg, "numOfRpcThreads")->i32;
|
||||||
tsNumOfCommitThreads = cfgGetItem(pCfg, "numOfCommitThreads")->i32;
|
tsNumOfCommitThreads = cfgGetItem(pCfg, "numOfCommitThreads")->i32;
|
||||||
tsNumOfMnodeQueryThreads = cfgGetItem(pCfg, "numOfMnodeQueryThreads")->i32;
|
|
||||||
tsNumOfMnodeReadThreads = cfgGetItem(pCfg, "numOfMnodeReadThreads")->i32;
|
tsNumOfMnodeReadThreads = cfgGetItem(pCfg, "numOfMnodeReadThreads")->i32;
|
||||||
tsNumOfVnodeQueryThreads = cfgGetItem(pCfg, "numOfVnodeQueryThreads")->i32;
|
tsNumOfVnodeQueryThreads = cfgGetItem(pCfg, "numOfVnodeQueryThreads")->i32;
|
||||||
tsNumOfVnodeStreamThreads = cfgGetItem(pCfg, "numOfVnodeStreamThreads")->i32;
|
tsNumOfVnodeStreamThreads = cfgGetItem(pCfg, "numOfVnodeStreamThreads")->i32;
|
||||||
|
|
@ -651,9 +633,7 @@ int32_t taosSetCfg(SConfig *pCfg, char *name) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 'd': {
|
case 'd': {
|
||||||
if (strcasecmp("deadLockKillQuery", name) == 0) {
|
if (strcasecmp("dDebugFlag", name) == 0) {
|
||||||
tsDeadLockKillQuery = cfgGetItem(pCfg, "deadLockKillQuery")->i32;
|
|
||||||
} else if (strcasecmp("dDebugFlag", name) == 0) {
|
|
||||||
dDebugFlag = cfgGetItem(pCfg, "dDebugFlag")->i32;
|
dDebugFlag = cfgGetItem(pCfg, "dDebugFlag")->i32;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
@ -710,9 +690,6 @@ int32_t taosSetCfg(SConfig *pCfg, char *name) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 'k': {
|
case 'k': {
|
||||||
if (strcasecmp("keepColumnName", name) == 0) {
|
|
||||||
tsKeepOriginalColumnName = cfgGetItem(pCfg, "keepColumnName")->bval;
|
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 'l': {
|
case 'l': {
|
||||||
|
|
@ -808,8 +785,6 @@ int32_t taosSetCfg(SConfig *pCfg, char *name) {
|
||||||
tsNumOfRpcThreads = cfgGetItem(pCfg, "numOfRpcThreads")->i32;
|
tsNumOfRpcThreads = cfgGetItem(pCfg, "numOfRpcThreads")->i32;
|
||||||
} else if (strcasecmp("numOfCommitThreads", name) == 0) {
|
} else if (strcasecmp("numOfCommitThreads", name) == 0) {
|
||||||
tsNumOfCommitThreads = cfgGetItem(pCfg, "numOfCommitThreads")->i32;
|
tsNumOfCommitThreads = cfgGetItem(pCfg, "numOfCommitThreads")->i32;
|
||||||
} else if (strcasecmp("numOfMnodeQueryThreads", name) == 0) {
|
|
||||||
tsNumOfMnodeQueryThreads = cfgGetItem(pCfg, "numOfMnodeQueryThreads")->i32;
|
|
||||||
} else if (strcasecmp("numOfMnodeReadThreads", name) == 0) {
|
} else if (strcasecmp("numOfMnodeReadThreads", name) == 0) {
|
||||||
tsNumOfMnodeReadThreads = cfgGetItem(pCfg, "numOfMnodeReadThreads")->i32;
|
tsNumOfMnodeReadThreads = cfgGetItem(pCfg, "numOfMnodeReadThreads")->i32;
|
||||||
} else if (strcasecmp("numOfVnodeQueryThreads", name) == 0) {
|
} else if (strcasecmp("numOfVnodeQueryThreads", name) == 0) {
|
||||||
|
|
@ -885,8 +860,6 @@ int32_t taosSetCfg(SConfig *pCfg, char *name) {
|
||||||
tsNumOfSupportVnodes = cfgGetItem(pCfg, "supportVnodes")->i32;
|
tsNumOfSupportVnodes = cfgGetItem(pCfg, "supportVnodes")->i32;
|
||||||
} else if (strcasecmp("statusInterval", name) == 0) {
|
} else if (strcasecmp("statusInterval", name) == 0) {
|
||||||
tsStatusInterval = cfgGetItem(pCfg, "statusInterval")->i32;
|
tsStatusInterval = cfgGetItem(pCfg, "statusInterval")->i32;
|
||||||
} else if (strcasecmp("slaveQuery", name) == 0) {
|
|
||||||
tsEnableSlaveQuery = cfgGetItem(pCfg, "slaveQuery")->bval;
|
|
||||||
} else if (strcasecmp("snodeShmSize", name) == 0) {
|
} else if (strcasecmp("snodeShmSize", name) == 0) {
|
||||||
tsSnodeShmSize = cfgGetItem(pCfg, "snodeShmSize")->i32;
|
tsSnodeShmSize = cfgGetItem(pCfg, "snodeShmSize")->i32;
|
||||||
} else if (strcasecmp("serverPort", name) == 0) {
|
} else if (strcasecmp("serverPort", name) == 0) {
|
||||||
|
|
|
||||||
|
|
@ -293,7 +293,10 @@ int metaAlterSTable(SMeta *pMeta, int64_t version, SVCreateStbReq *pReq) {
|
||||||
tdbTbcOpen(pMeta->pUidIdx, &pUidIdxc, &pMeta->txn);
|
tdbTbcOpen(pMeta->pUidIdx, &pUidIdxc, &pMeta->txn);
|
||||||
ret = tdbTbcMoveTo(pUidIdxc, &pReq->suid, sizeof(tb_uid_t), &c);
|
ret = tdbTbcMoveTo(pUidIdxc, &pReq->suid, sizeof(tb_uid_t), &c);
|
||||||
if (ret < 0 || c) {
|
if (ret < 0 || c) {
|
||||||
ASSERT(0);
|
tdbTbcClose(pUidIdxc);
|
||||||
|
|
||||||
|
terrno = TSDB_CODE_TDB_STB_NOT_EXIST;
|
||||||
|
// ASSERT(0);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -980,6 +983,9 @@ static int metaSaveToTbDb(SMeta *pMeta, const SMetaEntry *pME) {
|
||||||
tbDbKey.version = pME->version;
|
tbDbKey.version = pME->version;
|
||||||
tbDbKey.uid = pME->uid;
|
tbDbKey.uid = pME->uid;
|
||||||
|
|
||||||
|
metaDebug("vgId:%d, start to save table version:%" PRId64 "uid: %" PRId64, TD_VID(pMeta->pVnode), pME->version,
|
||||||
|
pME->uid);
|
||||||
|
|
||||||
pKey = &tbDbKey;
|
pKey = &tbDbKey;
|
||||||
kLen = sizeof(tbDbKey);
|
kLen = sizeof(tbDbKey);
|
||||||
|
|
||||||
|
|
@ -1012,6 +1018,9 @@ static int metaSaveToTbDb(SMeta *pMeta, const SMetaEntry *pME) {
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
_err:
|
_err:
|
||||||
|
metaError("vgId:%d, failed to save table version:%" PRId64 "uid: %" PRId64 " %s", TD_VID(pMeta->pVnode), pME->version,
|
||||||
|
pME->uid, tstrerror(terrno));
|
||||||
|
|
||||||
taosMemoryFree(pVal);
|
taosMemoryFree(pVal);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -62,6 +62,8 @@ sql select * from ct1 where ts < now -1d and ts > now +1d
|
||||||
sql select * from stb where ts < now -1d and ts > now +1d
|
sql select * from stb where ts < now -1d and ts > now +1d
|
||||||
sql select * from ct1 where ts < now -1d and ts > now +1d order by ts desc
|
sql select * from ct1 where ts < now -1d and ts > now +1d order by ts desc
|
||||||
sql select * from stb where ts < now -1d and ts > now +1d order by ts desc
|
sql select * from stb where ts < now -1d and ts > now +1d order by ts desc
|
||||||
|
sql select * from ct1 where t1 between 1000 and 2500
|
||||||
|
sql select * from stb where t1 between 1000 and 2500
|
||||||
|
|
||||||
print =============== step7: count
|
print =============== step7: count
|
||||||
sql select count(*) from ct1;
|
sql select count(*) from ct1;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue