Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
7ee6657c
T
TDengine
项目概览
taosdata
/
TDengine
大约 2 年 前同步成功
通知
1192
Star
22018
Fork
4786
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
7ee6657c
编写于
2月 21, 2022
作者:
L
Liu Jicong
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
extract convert to set msg
上级
82bcecc4
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
326 addition
and
310 deletion
+326
-310
include/util/tdef.h
include/util/tdef.h
+288
-290
source/client/src/tmq.c
source/client/src/tmq.c
+2
-4
source/common/src/tmsg.c
source/common/src/tmsg.c
+2
-0
source/dnode/vnode/inc/vnode.h
source/dnode/vnode/inc/vnode.h
+3
-3
source/dnode/vnode/src/tq/tqRead.c
source/dnode/vnode/src/tq/tqRead.c
+24
-9
source/libs/executor/src/executor.c
source/libs/executor/src/executor.c
+7
-4
未找到文件。
include/util/tdef.h
浏览文件 @
7ee6657c
...
@@ -24,369 +24,367 @@ extern "C" {
...
@@ -24,369 +24,367 @@ extern "C" {
#define TSDB__packed
#define TSDB__packed
#define TSKEY int64_t
#define TSKEY
int64_t
#define TSKEY_MIN INT64_MIN
#define TSKEY_MIN
INT64_MIN
#define TSKEY_MAX (INT64_MAX - 1)
#define TSKEY_MAX
(INT64_MAX - 1)
#define TSKEY_INITIAL_VAL TSKEY_MIN
#define TSKEY_INITIAL_VAL TSKEY_MIN
// Bytes for each type.
// Bytes for each type.
extern
const
int32_t
TYPE_BYTES
[
15
];
extern
const
int32_t
TYPE_BYTES
[
15
];
// TODO: replace and remove code below
// TODO: replace and remove code below
#define CHAR_BYTES
sizeof(char)
#define CHAR_BYTES sizeof(char)
#define SHORT_BYTES
sizeof(int16_t)
#define SHORT_BYTES sizeof(int16_t)
#define INT_BYTES
sizeof(int32_t)
#define INT_BYTES sizeof(int32_t)
#define LONG_BYTES
sizeof(int64_t)
#define LONG_BYTES sizeof(int64_t)
#define FLOAT_BYTES
sizeof(float)
#define FLOAT_BYTES sizeof(float)
#define DOUBLE_BYTES
sizeof(double)
#define DOUBLE_BYTES sizeof(double)
#define POINTER_BYTES
sizeof(void *) // 8 by default assert(sizeof(ptrdiff_t) == sizseof(void*)
#define POINTER_BYTES sizeof(void *) // 8 by default assert(sizeof(ptrdiff_t) == sizseof(void*)
#define TSDB_KEYSIZE
sizeof(TSKEY)
#define TSDB_KEYSIZE sizeof(TSKEY)
#define TSDB_NCHAR_SIZE
sizeof(int32_t)
#define TSDB_NCHAR_SIZE sizeof(int32_t)
// NULL definition
// NULL definition
#define TSDB_DATA_BOOL_NULL
0x02
#define TSDB_DATA_BOOL_NULL 0x02
#define TSDB_DATA_TINYINT_NULL
0x80
#define TSDB_DATA_TINYINT_NULL 0x80
#define TSDB_DATA_SMALLINT_NULL
0x8000
#define TSDB_DATA_SMALLINT_NULL 0x8000
#define TSDB_DATA_INT_NULL
0x80000000L
#define TSDB_DATA_INT_NULL 0x80000000L
#define TSDB_DATA_BIGINT_NULL
0x8000000000000000L
#define TSDB_DATA_BIGINT_NULL 0x8000000000000000L
#define TSDB_DATA_TIMESTAMP_NULL
TSDB_DATA_BIGINT_NULL
#define TSDB_DATA_TIMESTAMP_NULL TSDB_DATA_BIGINT_NULL
#define TSDB_DATA_FLOAT_NULL
0x7FF00000
// it is an NAN
#define TSDB_DATA_FLOAT_NULL
0x7FF00000
// it is an NAN
#define TSDB_DATA_DOUBLE_NULL
0x7FFFFF0000000000L
// an NAN
#define TSDB_DATA_DOUBLE_NULL
0x7FFFFF0000000000L
// an NAN
#define TSDB_DATA_NCHAR_NULL
0xFFFFFFFF
#define TSDB_DATA_NCHAR_NULL 0xFFFFFFFF
#define TSDB_DATA_BINARY_NULL
0xFF
#define TSDB_DATA_BINARY_NULL 0xFF
#define TSDB_DATA_UTINYINT_NULL
0xFF
#define TSDB_DATA_UTINYINT_NULL 0xFF
#define TSDB_DATA_USMALLINT_NULL
0xFFFF
#define TSDB_DATA_USMALLINT_NULL 0xFFFF
#define TSDB_DATA_UINT_NULL
0xFFFFFFFF
#define TSDB_DATA_UINT_NULL 0xFFFFFFFF
#define TSDB_DATA_UBIGINT_NULL
0xFFFFFFFFFFFFFFFFL
#define TSDB_DATA_UBIGINT_NULL 0xFFFFFFFFFFFFFFFFL
#define TSDB_DATA_NULL_STR
"NULL"
#define TSDB_DATA_NULL_STR "NULL"
#define TSDB_DATA_NULL_STR_L
"null"
#define TSDB_DATA_NULL_STR_L "null"
#define TSDB_NETTEST_USER
"nettestinternal"
#define TSDB_NETTEST_USER "nettestinternal"
#define TSDB_DEFAULT_USER
"root"
#define TSDB_DEFAULT_USER "root"
#ifdef _TD_POWER_
#ifdef _TD_POWER_
#define TSDB_DEFAULT_PASS
"powerdb"
#define TSDB_DEFAULT_PASS "powerdb"
#elif (_TD_TQ_ == true)
#elif (_TD_TQ_ == true)
#define TSDB_DEFAULT_PASS
"tqueue"
#define TSDB_DEFAULT_PASS "tqueue"
#elif (_TD_PRO_ == true)
#elif (_TD_PRO_ == true)
#define TSDB_DEFAULT_PASS
"prodb"
#define TSDB_DEFAULT_PASS "prodb"
#else
#else
#define TSDB_DEFAULT_PASS
"taosdata"
#define TSDB_DEFAULT_PASS "taosdata"
#endif
#endif
#define SHELL_MAX_PASSWORD_LEN
20
#define SHELL_MAX_PASSWORD_LEN 20
#define TSDB_TRUE
1
#define TSDB_TRUE 1
#define TSDB_FALSE
0
#define TSDB_FALSE 0
#define TSDB_OK
0
#define TSDB_OK 0
#define TSDB_ERR -1
#define TSDB_ERR -1
#define TS_PATH_DELIMITER "."
#define TS_PATH_DELIMITER "."
#define TS_ESCAPE_CHAR '`'
#define TS_ESCAPE_CHAR '`'
#define TSDB_TIME_PRECISION_MILLI
0
#define TSDB_TIME_PRECISION_MILLI 0
#define TSDB_TIME_PRECISION_MICRO
1
#define TSDB_TIME_PRECISION_MICRO 1
#define TSDB_TIME_PRECISION_NANO
2
#define TSDB_TIME_PRECISION_NANO 2
#define TSDB_TIME_PRECISION_MILLI_STR "ms"
#define TSDB_TIME_PRECISION_MILLI_STR "ms"
#define TSDB_TIME_PRECISION_MICRO_STR "us"
#define TSDB_TIME_PRECISION_MICRO_STR "us"
#define TSDB_TIME_PRECISION_NANO_STR "ns"
#define TSDB_TIME_PRECISION_NANO_STR "ns"
#define TSDB_TICK_PER_SECOND(precision) ((int64_t)((precision)==TSDB_TIME_PRECISION_MILLI ? 1e3L : ((precision)==TSDB_TIME_PRECISION_MICRO ? 1e6L : 1e9L)))
#define TSDB_TICK_PER_SECOND(precision) \
((int64_t)((precision) == TSDB_TIME_PRECISION_MILLI ? 1e3L \
: ((precision) == TSDB_TIME_PRECISION_MICRO ? 1e6L : 1e9L)))
#define T_MEMBER_SIZE(type, member) sizeof(((type *)0)->member)
#define T_MEMBER_SIZE(type, member) sizeof(((type *)0)->member)
#define T_APPEND_MEMBER(dst, ptr, type, member) \
#define T_APPEND_MEMBER(dst, ptr, type, member) \
do {\
do { \
memcpy((void *)(dst), (void *)(&((ptr)->member)), T_MEMBER_SIZE(type, member));\
memcpy((void *)(dst), (void *)(&((ptr)->member)), T_MEMBER_SIZE(type, member)); \
dst = (void *)((char *)(dst) + T_MEMBER_SIZE(type, member));\
dst = (void *)((char *)(dst) + T_MEMBER_SIZE(type, member)); \
} while(0)
} while (0)
#define T_READ_MEMBER(src, type, target) \
#define T_READ_MEMBER(src, type, target) \
do { \
do { \
(target) = *(type *)(src); \
(target) = *(type *)(src); \
(src) = (void *)((char *)src + sizeof(type));\
(src) = (void *)((char *)src + sizeof(type)); \
} while(0)
} while (0)
// TODO: check if below is necessary
// TODO: check if below is necessary
#define TSDB_RELATION_INVALID 0
#define TSDB_RELATION_INVALID
0
#define TSDB_RELATION_LESS 1
#define TSDB_RELATION_LESS
1
#define TSDB_RELATION_GREATER 2
#define TSDB_RELATION_GREATER
2
#define TSDB_RELATION_EQUAL 3
#define TSDB_RELATION_EQUAL
3
#define TSDB_RELATION_LESS_EQUAL 4
#define TSDB_RELATION_LESS_EQUAL
4
#define TSDB_RELATION_GREATER_EQUAL 5
#define TSDB_RELATION_GREATER_EQUAL 5
#define TSDB_RELATION_NOT_EQUAL 6
#define TSDB_RELATION_NOT_EQUAL
6
#define TSDB_RELATION_LIKE 7
#define TSDB_RELATION_LIKE
7
#define TSDB_RELATION_ISNULL 8
#define TSDB_RELATION_ISNULL
8
#define TSDB_RELATION_NOTNULL 9
#define TSDB_RELATION_NOTNULL
9
#define TSDB_RELATION_IN 10
#define TSDB_RELATION_IN
10
#define TSDB_RELATION_AND
11
#define TSDB_RELATION_AND 11
#define TSDB_RELATION_OR
12
#define TSDB_RELATION_OR 12
#define TSDB_RELATION_NOT
13
#define TSDB_RELATION_NOT 13
#define TSDB_RELATION_MATCH
14
#define TSDB_RELATION_MATCH 14
#define TSDB_RELATION_NMATCH
15
#define TSDB_RELATION_NMATCH 15
#define TSDB_BINARY_OP_ADD
4000
#define TSDB_BINARY_OP_ADD 4000
#define TSDB_BINARY_OP_SUBTRACT
4001
#define TSDB_BINARY_OP_SUBTRACT 4001
#define TSDB_BINARY_OP_MULTIPLY
4002
#define TSDB_BINARY_OP_MULTIPLY 4002
#define TSDB_BINARY_OP_DIVIDE
4003
#define TSDB_BINARY_OP_DIVIDE 4003
#define TSDB_BINARY_OP_REMAINDER
4004
#define TSDB_BINARY_OP_REMAINDER 4004
#define TSDB_BINARY_OP_CONCAT
4005
#define TSDB_BINARY_OP_CONCAT 4005
#define FUNCTION_CEIL
4500
#define FUNCTION_CEIL 4500
#define FUNCTION_FLOOR
4501
#define FUNCTION_FLOOR 4501
#define FUNCTION_ABS
4502
#define FUNCTION_ABS 4502
#define FUNCTION_ROUND
4503
#define FUNCTION_ROUND 4503
#define FUNCTION_LENGTH
4800
#define FUNCTION_LENGTH 4800
#define FUNCTION_CONCAT
4801
#define FUNCTION_CONCAT 4801
#define FUNCTION_LTRIM
4802
#define FUNCTION_LTRIM 4802
#define FUNCTION_RTRIM
4803
#define FUNCTION_RTRIM 4803
#define IS_RELATION_OPTR(op) (((op) >= TSDB_RELATION_LESS) && ((op) < TSDB_RELATION_IN))
#define IS_RELATION_OPTR(op)
(((op) >= TSDB_RELATION_LESS) && ((op) < TSDB_RELATION_IN))
#define IS_ARITHMETIC_OPTR(op) (((op) >= TSDB_BINARY_OP_ADD) && ((op) <= TSDB_BINARY_OP_REMAINDER))
#define IS_ARITHMETIC_OPTR(op) (((op) >= TSDB_BINARY_OP_ADD) && ((op) <= TSDB_BINARY_OP_REMAINDER))
#define TSDB_NAME_DELIMITER_LEN
1
#define TSDB_NAME_DELIMITER_LEN 1
#define TSDB_UNI_LEN
24
#define TSDB_UNI_LEN 24
#define TSDB_USER_LEN
TSDB_UNI_LEN
#define TSDB_USER_LEN TSDB_UNI_LEN
// ACCOUNT is a 32 bit positive integer
// ACCOUNT is a 32 bit positive integer
// this is the length of its string representation, including the terminator zero
// this is the length of its string representation, including the terminator zero
#define TSDB_ACCT_ID_LEN
11
#define TSDB_ACCT_ID_LEN 11
#define TSDB_MAX_COLUMNS
4096
#define TSDB_MAX_COLUMNS 4096
#define TSDB_MIN_COLUMNS
2 //
PRIMARY COLUMN(timestamp) + other columns
#define TSDB_MIN_COLUMNS
2 //
PRIMARY COLUMN(timestamp) + other columns
#define TSDB_NODE_NAME_LEN
64
#define TSDB_NODE_NAME_LEN 64
#define TSDB_TABLE_NAME_LEN
193
// it is a null-terminated string
#define TSDB_TABLE_NAME_LEN
193
// it is a null-terminated string
#define TSDB_TOPIC_NAME_LEN
193
// it is a null-terminated string
#define TSDB_TOPIC_NAME_LEN
193
// it is a null-terminated string
#define TSDB_DB_NAME_LEN
65
#define TSDB_DB_NAME_LEN 65
#define TSDB_DB_FNAME_LEN
(TSDB_ACCT_ID_LEN + TSDB_DB_NAME_LEN + TSDB_NAME_DELIMITER_LEN)
#define TSDB_DB_FNAME_LEN (TSDB_ACCT_ID_LEN + TSDB_DB_NAME_LEN + TSDB_NAME_DELIMITER_LEN)
#define TSDB_FUNC_NAME_LEN
65
#define TSDB_FUNC_NAME_LEN 65
#define TSDB_FUNC_COMMENT_LEN
4096
#define TSDB_FUNC_COMMENT_LEN 4096
#define TSDB_FUNC_CODE_LEN
(65535 - 512)
#define TSDB_FUNC_CODE_LEN (65535 - 512)
#define TSDB_FUNC_BUF_SIZE
512
#define TSDB_FUNC_BUF_SIZE 512
#define TSDB_FUNC_TYPE_SCALAR
1
#define TSDB_FUNC_TYPE_SCALAR 1
#define TSDB_FUNC_TYPE_AGGREGATE
2
#define TSDB_FUNC_TYPE_AGGREGATE 2
#define TSDB_FUNC_MAX_RETRIEVE
1024
#define TSDB_FUNC_MAX_RETRIEVE 1024
#define TSDB_TYPE_STR_MAX_LEN
32
#define TSDB_TYPE_STR_MAX_LEN 32
#define TSDB_TABLE_FNAME_LEN
(TSDB_DB_FNAME_LEN + TSDB_TABLE_NAME_LEN + TSDB_NAME_DELIMITER_LEN)
#define TSDB_TABLE_FNAME_LEN (TSDB_DB_FNAME_LEN + TSDB_TABLE_NAME_LEN + TSDB_NAME_DELIMITER_LEN)
#define TSDB_TOPIC_FNAME_LEN
TSDB_TABLE_FNAME_LEN
#define TSDB_TOPIC_FNAME_LEN TSDB_TABLE_FNAME_LEN
#define TSDB_CONSUMER_GROUP_LEN
192
#define TSDB_CONSUMER_GROUP_LEN 192
#define TSDB_SUBSCRIBE_KEY_LEN
(TSDB_CONSUMER_GROUP_LEN + TSDB_TOPIC_FNAME_LEN + 2)
#define TSDB_SUBSCRIBE_KEY_LEN (TSDB_CONSUMER_GROUP_LEN + TSDB_TOPIC_FNAME_LEN + 2)
#define TSDB_COL_NAME_LEN
65
#define TSDB_COL_NAME_LEN 65
#define TSDB_MAX_SAVED_SQL_LEN
TSDB_MAX_COLUMNS * 64
#define TSDB_MAX_SAVED_SQL_LEN TSDB_MAX_COLUMNS * 64
#define TSDB_MAX_SQL_LEN
TSDB_PAYLOAD_SIZE
#define TSDB_MAX_SQL_LEN TSDB_PAYLOAD_SIZE
#define TSDB_MAX_SQL_SHOW_LEN
1024
#define TSDB_MAX_SQL_SHOW_LEN 1024
#define TSDB_MAX_ALLOWED_SQL_LEN
(1*1024*1024u)
// sql length should be less than 1mb
#define TSDB_MAX_ALLOWED_SQL_LEN
(1 * 1024 * 1024u)
// sql length should be less than 1mb
#define TSDB_APP_NAME_LEN
TSDB_UNI_LEN
#define TSDB_APP_NAME_LEN TSDB_UNI_LEN
#define TSDB_STB_COMMENT_LEN
1024
#define TSDB_STB_COMMENT_LEN 1024
/**
/**
* In some scenarios uint16_t (0~65535) is used to store the row len.
* In some scenarios uint16_t (0~65535) is used to store the row len.
* - Firstly, we use 65531(65535 - 4), as the SDataRow/SKVRow contains 4 bits header.
* - Firstly, we use 65531(65535 - 4), as the SDataRow/SKVRow contains 4 bits header.
* - Secondly, if all cols are VarDataT type except primary key, we need 4 bits to store the offset, thus
* - Secondly, if all cols are VarDataT type except primary key, we need 4 bits to store the offset, thus
* the final value is 65531-(4096-1)*4 = 49151.
* the final value is 65531-(4096-1)*4 = 49151.
*/
*/
#define TSDB_MAX_BYTES_PER_ROW
49151
#define TSDB_MAX_BYTES_PER_ROW 49151
#define TSDB_MAX_TAGS_LEN
16384
#define TSDB_MAX_TAGS_LEN 16384
#define TSDB_MAX_TAGS
128
#define TSDB_MAX_TAGS 128
#define TSDB_MAX_TAG_CONDITIONS
1024
#define TSDB_MAX_TAG_CONDITIONS 1024
#define TSDB_AUTH_LEN
16
#define TSDB_AUTH_LEN 16
#define TSDB_PASSWORD_LEN
32
#define TSDB_PASSWORD_LEN 32
#define TSDB_USET_PASSWORD_LEN
129
#define TSDB_USET_PASSWORD_LEN 129
#define TSDB_VERSION_LEN
12
#define TSDB_VERSION_LEN 12
#define TSDB_LABEL_LEN
8
#define TSDB_LABEL_LEN
8
#define TSDB_CLUSTER_ID_LEN
40
#define TSDB_CLUSTER_ID_LEN 40
#define TSDB_FQDN_LEN
128
#define TSDB_FQDN_LEN 128
#define TSDB_EP_LEN
(TSDB_FQDN_LEN + 6)
#define TSDB_EP_LEN (TSDB_FQDN_LEN + 6)
#define TSDB_IPv4ADDR_LEN
16
#define TSDB_IPv4ADDR_LEN 16
#define TSDB_FILENAME_LEN
128
#define TSDB_FILENAME_LEN 128
#define TSDB_SHOW_SQL_LEN
512
#define TSDB_SHOW_SQL_LEN 512
#define TSDB_SHOW_SUBQUERY_LEN
1000
#define TSDB_SHOW_SUBQUERY_LEN 1000
#define TSDB_SLOW_QUERY_SQL_LEN
512
#define TSDB_SLOW_QUERY_SQL_LEN 512
#define TSDB_TRANS_STAGE_LEN
12
#define TSDB_TRANS_STAGE_LEN 12
#define TSDB_TRANS_DESC_LEN
16
#define TSDB_TRANS_DESC_LEN 16
#define TSDB_TRANS_ERROR_LEN
128
#define TSDB_TRANS_ERROR_LEN 128
#define TSDB_STEP_NAME_LEN
32
#define TSDB_STEP_NAME_LEN 32
#define TSDB_STEP_DESC_LEN
128
#define TSDB_STEP_DESC_LEN 128
#define TSDB_ERROR_MSG_LEN
1024
#define TSDB_ERROR_MSG_LEN 1024
#define TSDB_DNODE_CONFIG_LEN
128
#define TSDB_DNODE_CONFIG_LEN 128
#define TSDB_DNODE_VALUE_LEN
256
#define TSDB_DNODE_VALUE_LEN 256
#define TSDB_MQTT_HOSTNAME_LEN
64
#define TSDB_MQTT_HOSTNAME_LEN 64
#define TSDB_MQTT_PORT_LEN
8
#define TSDB_MQTT_PORT_LEN 8
#define TSDB_MQTT_USER_LEN
24
#define TSDB_MQTT_USER_LEN 24
#define TSDB_MQTT_PASS_LEN
24
#define TSDB_MQTT_PASS_LEN 24
#define TSDB_MQTT_TOPIC_LEN
64
#define TSDB_MQTT_TOPIC_LEN 64
#define TSDB_MQTT_CLIENT_ID_LEN
32
#define TSDB_MQTT_CLIENT_ID_LEN 32
#define TSDB_DB_TYPE_DEFAULT
0
#define TSDB_DB_TYPE_DEFAULT 0
#define TSDB_DB_TYPE_TOPIC
1
#define TSDB_DB_TYPE_TOPIC 1
#define TSDB_DEFAULT_PKT_SIZE
65480 //
same as RPC_MAX_UDP_SIZE
#define TSDB_DEFAULT_PKT_SIZE
65480 //
same as RPC_MAX_UDP_SIZE
#define TSDB_PAYLOAD_SIZE TSDB_DEFAULT_PKT_SIZE
#define TSDB_PAYLOAD_SIZE TSDB_DEFAULT_PKT_SIZE
#define TSDB_DEFAULT_PAYLOAD_SIZE 5120
// default payload size, greater than PATH_MAX value
#define TSDB_DEFAULT_PAYLOAD_SIZE 5120 // default payload size, greater than PATH_MAX value
#define TSDB_EXTRA_PAYLOAD_SIZE 128
// extra bytes for auth
#define TSDB_EXTRA_PAYLOAD_SIZE 128 // extra bytes for auth
#define TSDB_CQ_SQL_SIZE 1024
#define TSDB_CQ_SQL_SIZE 1024
#define TSDB_MIN_VNODES 16
#define TSDB_MIN_VNODES 16
#define TSDB_MAX_VNODES 512
#define TSDB_MAX_VNODES 512
#define TSDB_MIN_VNODES_PER_DB 1
#define TSDB_MIN_VNODES_PER_DB 1
#define TSDB_MAX_VNODES_PER_DB 4096
#define TSDB_MAX_VNODES_PER_DB 4096
#define TSDB_DEFAULT_VN_PER_DB 2
#define TSDB_DEFAULT_VN_PER_DB 2
#define TSDB_DNODE_ROLE_ANY 0
#define TSDB_DNODE_ROLE_MGMT 1
#define TSDB_DNODE_ROLE_VNODE 2
#define TSDB_MAX_REPLICA 5
#define TSDB_
TBNAME_COLUMN_INDEX (-1)
#define TSDB_
DNODE_ROLE_ANY 0
#define TSDB_
UD_COLUMN_INDEX (-1000)
#define TSDB_
DNODE_ROLE_MGMT 1
#define TSDB_
RES_COL_ID (-5000)
#define TSDB_
DNODE_ROLE_VNODE 2
#define TSDB_MULTI_TABLEMETA_MAX_NUM 100000 // maximum batch size allowed to load table meta
#define TSDB_MAX_REPLICA 5
#define TSDB_MIN_CACHE_BLOCK_SIZE 1
#define TSDB_MAX_CACHE_BLOCK_SIZE 128 // 128MB for each vnode
#define TSDB_DEFAULT_CACHE_BLOCK_SIZE 16
#define TSDB_
MIN_TOTAL_BLOCKS 3
#define TSDB_
TBNAME_COLUMN_INDEX (-1)
#define TSDB_
MAX_TOTAL_BLOCKS 10000
#define TSDB_
UD_COLUMN_INDEX (-1000)
#define TSDB_
DEFAULT_TOTAL_BLOCKS 6
#define TSDB_
RES_COL_ID (-5000)
#define TSDB_MIN_DAYS_PER_FILE 1
#define TSDB_MULTI_TABLEMETA_MAX_NUM 100000 // maximum batch size allowed to load table meta
#define TSDB_MAX_DAYS_PER_FILE 3650
#define TSDB_DEFAULT_DAYS_PER_FILE 10
#define TSDB_MIN_
KEEP 1 // data in db to be reserved.
#define TSDB_MIN_
CACHE_BLOCK_SIZE 1
#define TSDB_MAX_
KEEP 365000 // data in db to be reserved.
#define TSDB_MAX_
CACHE_BLOCK_SIZE 128 // 128MB for each vnode
#define TSDB_DEFAULT_
KEEP 3650 // ten years
#define TSDB_DEFAULT_
CACHE_BLOCK_SIZE 16
#define TSDB_MIN_
MIN_ROW_FBLOCK 10
#define TSDB_MIN_
TOTAL_BLOCKS 3
#define TSDB_MAX_
MIN_ROW_FBLOCK 1
000
#define TSDB_MAX_
TOTAL_BLOCKS 10
000
#define TSDB_DEFAULT_
MIN_ROW_FBLOCK 100
#define TSDB_DEFAULT_
TOTAL_BLOCKS 6
#define TSDB_MIN_
MAX_ROW_FBLOCK 200
#define TSDB_MIN_
DAYS_PER_FILE 1
#define TSDB_MAX_
MAX_ROW_FBLOCK 1000
0
#define TSDB_MAX_
DAYS_PER_FILE 365
0
#define TSDB_DEFAULT_
MAX_ROW_FBLOCK 4096
#define TSDB_DEFAULT_
DAYS_PER_FILE 10
#define TSDB_MIN_
COMMIT_TIME 30
#define TSDB_MIN_
KEEP 1 // data in db to be reserved.
#define TSDB_MAX_
COMMIT_TIME 40960
#define TSDB_MAX_
KEEP 365000 // data in db to be reserved.
#define TSDB_DEFAULT_
COMMIT_TIME 3600
#define TSDB_DEFAULT_
KEEP 3650 // ten years
#define TSDB_MIN_
FSYNC_PERIOD
0
#define TSDB_MIN_
MIN_ROW_FBLOCK 1
0
#define TSDB_MAX_
FSYNC_PERIOD 180000 // millisecond
#define TSDB_MAX_
MIN_ROW_FBLOCK 1000
#define TSDB_DEFAULT_
FSYNC_PERIOD 3000 // three second
#define TSDB_DEFAULT_
MIN_ROW_FBLOCK 100
#define TSDB_MIN_
WAL_LEVEL
0
#define TSDB_MIN_
MAX_ROW_FBLOCK 20
0
#define TSDB_MAX_
WAL_LEVEL 2
#define TSDB_MAX_
MAX_ROW_FBLOCK 10000
#define TSDB_DEFAULT_
WAL_LEVEL 1
#define TSDB_DEFAULT_
MAX_ROW_FBLOCK 4096
#define TSDB_MIN_
PRECISION TSDB_TIME_PRECISION_MILLI
#define TSDB_MIN_
COMMIT_TIME 30
#define TSDB_MAX_
PRECISION TSDB_TIME_PRECISION_NANO
#define TSDB_MAX_
COMMIT_TIME 40960
#define TSDB_DEFAULT_
PRECISION TSDB_TIME_PRECISION_MILLI
#define TSDB_DEFAULT_
COMMIT_TIME 3600
#define TSDB_MIN_
COMP_LEVEL
0
#define TSDB_MIN_
FSYNC_PERIOD
0
#define TSDB_MAX_
COMP_LEVEL 2
#define TSDB_MAX_
FSYNC_PERIOD 180000 // millisecond
#define TSDB_DEFAULT_
COMP_LEVEL 2
#define TSDB_DEFAULT_
FSYNC_PERIOD 3000 // three second
#define TSDB_MIN_
DB_REPLICA_OPTION 1
#define TSDB_MIN_
WAL_LEVEL 0
#define TSDB_MAX_
DB_REPLICA_OPTION 3
#define TSDB_MAX_
WAL_LEVEL 2
#define TSDB_DEFAULT_
DB_REPLICA_OPTION
1
#define TSDB_DEFAULT_
WAL_LEVEL
1
#define TSDB_MIN_
DB_QUORUM_OPTION 1
#define TSDB_MIN_
PRECISION TSDB_TIME_PRECISION_MILLI
#define TSDB_MAX_
DB_QUORUM_OPTION 2
#define TSDB_MAX_
PRECISION TSDB_TIME_PRECISION_NANO
#define TSDB_DEFAULT_
DB_QUORUM_OPTION 1
#define TSDB_DEFAULT_
PRECISION TSDB_TIME_PRECISION_MILLI
#define TSDB_MIN_
DB_UPDATE
0
#define TSDB_MIN_
COMP_LEVEL
0
#define TSDB_MAX_
DB_UPDATE
2
#define TSDB_MAX_
COMP_LEVEL
2
#define TSDB_DEFAULT_
DB_UPDATE_OPTION 0
#define TSDB_DEFAULT_
COMP_LEVEL 2
#define TSDB_MIN_DB_
CACHE_LAST_ROW 0
#define TSDB_MIN_DB_
REPLICA_OPTION 1
#define TSDB_MAX_DB_
CACHE_LAST_ROW
3
#define TSDB_MAX_DB_
REPLICA_OPTION
3
#define TSDB_DEFAULT_
CACHE_LAST_ROW 0
#define TSDB_DEFAULT_
DB_REPLICA_OPTION 1
#define TSDB_MAX_JOIN_TABLE_NUM 10
#define TSDB_MIN_DB_QUORUM_OPTION 1
#define TSDB_MAX_UNION_CLAUSE 5
#define TSDB_MAX_DB_QUORUM_OPTION 2
#define TSDB_DEFAULT_DB_QUORUM_OPTION 1
#define TSDB_MAX_FIELD_LEN 16384
#define TSDB_MIN_DB_UPDATE 0
#define TSDB_MAX_BINARY_LEN (TSDB_MAX_FIELD_LEN-TSDB_KEYSIZE) // keep 16384
#define TSDB_MAX_DB_UPDATE 2
#define TSDB_MAX_NCHAR_LEN (TSDB_MAX_FIELD_LEN-TSDB_KEYSIZE) // keep 16384
#define TSDB_DEFAULT_DB_UPDATE_OPTION 0
#define PRIMARYKEY_TIMESTAMP_COL_ID 1
#define COL_REACH_END(colId, maxColId) ((colId) > (maxColId))
#define TSDB_MAX_RPC_THREADS 5
#define TSDB_MIN_DB_CACHE_LAST_ROW 0
#define TSDB_MAX_DB_CACHE_LAST_ROW 3
#define TSDB_DEFAULT_CACHE_LAST_ROW 0
#define TSDB_
QUERY_TYPE_NON_TYPE 0x00u // none type
#define TSDB_
MAX_JOIN_TABLE_NUM 10
#define TSDB_
QUERY_TYPE_FREE_RESOURCE 0x01u // free qhandle at vnode
#define TSDB_
MAX_UNION_CLAUSE 5
#define TSDB_MAX_FIELD_LEN 16384
#define TSDB_MAX_BINARY_LEN (TSDB_MAX_FIELD_LEN - TSDB_KEYSIZE) // keep 16384
#define TSDB_MAX_NCHAR_LEN (TSDB_MAX_FIELD_LEN - TSDB_KEYSIZE) // keep 16384
#define PRIMARYKEY_TIMESTAMP_COL_ID 1
#define COL_REACH_END(colId, maxColId) ((colId) > (maxColId))
#define TSDB_M
ETA_COMPACT_RATIO 0 // disable tsdb meta compact by default
#define TSDB_M
AX_RPC_THREADS 5
#define TSDB_QUERY_TYPE_NON_TYPE 0x00u // none type
#define TSDB_QUERY_TYPE_FREE_RESOURCE 0x01u // free qhandle at vnode
#define TSDB_META_COMPACT_RATIO 0 // disable tsdb meta compact by default
/*
/*
* 1. ordinary sub query for select * from super_table
* 1. ordinary sub query for select * from super_table
* 2. all sqlobj generated by createSubqueryObj with this flag
* 2. all sqlobj generated by createSubqueryObj with this flag
*/
*/
#define TSDB_QUERY_TYPE_SUBQUERY
0x02u
#define TSDB_QUERY_TYPE_SUBQUERY 0x02u
#define TSDB_QUERY_TYPE_STABLE_SUBQUERY
0x04u
// two-stage subquery for super table
#define TSDB_QUERY_TYPE_STABLE_SUBQUERY
0x04u
// two-stage subquery for super table
#define TSDB_QUERY_TYPE_TABLE_QUERY
0x08u
// query ordinary table; below only apply to client side
#define TSDB_QUERY_TYPE_TABLE_QUERY
0x08u
// query ordinary table; below only apply to client side
#define TSDB_QUERY_TYPE_STABLE_QUERY
0x10u
// query on super table
#define TSDB_QUERY_TYPE_STABLE_QUERY
0x10u
// query on super table
#define TSDB_QUERY_TYPE_JOIN_QUERY
0x20u
// join query
#define TSDB_QUERY_TYPE_JOIN_QUERY
0x20u
// join query
#define TSDB_QUERY_TYPE_PROJECTION_QUERY
0x40u
// select *,columns... query
#define TSDB_QUERY_TYPE_PROJECTION_QUERY
0x40u
// select *,columns... query
#define TSDB_QUERY_TYPE_JOIN_SEC_STAGE
0x80u
// join sub query at the second stage
#define TSDB_QUERY_TYPE_JOIN_SEC_STAGE
0x80u
// join sub query at the second stage
#define TSDB_QUERY_TYPE_TAG_FILTER_QUERY
0x400u
#define TSDB_QUERY_TYPE_TAG_FILTER_QUERY 0x400u
#define TSDB_QUERY_TYPE_INSERT
0x100u
// insert type
#define TSDB_QUERY_TYPE_INSERT
0x100u
// insert type
#define TSDB_QUERY_TYPE_MULTITABLE_QUERY
0x200u
#define TSDB_QUERY_TYPE_MULTITABLE_QUERY 0x200u
#define TSDB_QUERY_TYPE_FILE_INSERT
0x400u
// insert data from file
#define TSDB_QUERY_TYPE_FILE_INSERT
0x400u
// insert data from file
#define TSDB_QUERY_TYPE_STMT_INSERT
0x800u
// stmt insert type
#define TSDB_QUERY_TYPE_STMT_INSERT
0x800u
// stmt insert type
#define TSDB_QUERY_TYPE_NEST_SUBQUERY
0x1000u
// nested sub query
#define TSDB_QUERY_TYPE_NEST_SUBQUERY
0x1000u
// nested sub query
#define TSDB_QUERY_HAS_TYPE(x, _type)
(((x) & (_type)) != 0)
#define TSDB_QUERY_HAS_TYPE(x, _type) (((x) & (_type)) != 0)
#define TSDB_QUERY_SET_TYPE(x, _type)
((x) |= (_type))
#define TSDB_QUERY_SET_TYPE(x, _type) ((x) |= (_type))
#define TSDB_QUERY_CLEAR_TYPE(x, _type)
((x) &= (~_type))
#define TSDB_QUERY_CLEAR_TYPE(x, _type) ((x) &= (~_type))
#define TSDB_QUERY_RESET_TYPE(x)
((x) = TSDB_QUERY_TYPE_NON_TYPE)
#define TSDB_QUERY_RESET_TYPE(x) ((x) = TSDB_QUERY_TYPE_NON_TYPE)
#define TSDB_ORDER_ASC
1
#define TSDB_ORDER_ASC 1
#define TSDB_ORDER_DESC
2
#define TSDB_ORDER_DESC 2
#define TSDB_DEFAULT_CLUSTER_HASH_SIZE
1
#define TSDB_DEFAULT_CLUSTER_HASH_SIZE 1
#define TSDB_DEFAULT_MNODES_HASH_SIZE
5
#define TSDB_DEFAULT_MNODES_HASH_SIZE 5
#define TSDB_DEFAULT_DNODES_HASH_SIZE
10
#define TSDB_DEFAULT_DNODES_HASH_SIZE 10
#define TSDB_DEFAULT_ACCOUNTS_HASH_SIZE
10
#define TSDB_DEFAULT_ACCOUNTS_HASH_SIZE 10
#define TSDB_DEFAULT_USERS_HASH_SIZE
20
#define TSDB_DEFAULT_USERS_HASH_SIZE 20
#define TSDB_DEFAULT_DBS_HASH_SIZE
100
#define TSDB_DEFAULT_DBS_HASH_SIZE 100
#define TSDB_DEFAULT_VGROUPS_HASH_SIZE
100
#define TSDB_DEFAULT_VGROUPS_HASH_SIZE 100
#define TSDB_DEFAULT_STABLES_HASH_SIZE
100
#define TSDB_DEFAULT_STABLES_HASH_SIZE 100
#define TSDB_DEFAULT_CTABLES_HASH_SIZE
20000
#define TSDB_DEFAULT_CTABLES_HASH_SIZE 20000
#define TSDB_MAX_WAL_SIZE
(1024*1024*
3)
#define TSDB_MAX_WAL_SIZE
(1024 * 1024 *
3)
#define TSDB_ARB_DUMMY_TIME
4765104000000
// 2121-01-01 00:00:00.000, :P
#define TSDB_ARB_DUMMY_TIME
4765104000000
// 2121-01-01 00:00:00.000, :P
#define TFS_MAX_TIERS 3
#define TFS_MAX_TIERS
3
#define TFS_MAX_DISKS_PER_TIER 16
#define TFS_MAX_DISKS_PER_TIER 16
#define TFS_MAX_DISKS (TFS_MAX_TIERS * TFS_MAX_DISKS_PER_TIER)
#define TFS_MAX_DISKS
(TFS_MAX_TIERS * TFS_MAX_DISKS_PER_TIER)
#define TFS_MIN_LEVEL 0
#define TFS_MIN_LEVEL
0
#define TFS_MAX_LEVEL (TFS_MAX_TIERS - 1)
#define TFS_MAX_LEVEL
(TFS_MAX_TIERS - 1)
#define TFS_PRIMARY_LEVEL 0
#define TFS_PRIMARY_LEVEL
0
#define TFS_PRIMARY_ID 0
#define TFS_PRIMARY_ID
0
#define TFS_MIN_DISK_FREE_SIZE 50 * 1024 * 1024
#define TFS_MIN_DISK_FREE_SIZE 50 * 1024 * 1024
enum
{
TRANS_STAT_INIT
=
0
,
TRANS_STAT_EXECUTING
,
TRANS_STAT_EXECUTED
,
TRANS_STAT_ROLLBACKING
,
TRANS_STAT_ROLLBACKED
};
enum
{
TRANS_STAT_INIT
=
0
,
TRANS_STAT_EXECUTING
,
TRANS_STAT_EXECUTED
,
TRANS_STAT_ROLLBACKING
,
TRANS_STAT_ROLLBACKED
};
...
...
source/client/src/tmq.c
浏览文件 @
7ee6657c
...
@@ -75,7 +75,7 @@ struct tmq_message_t {
...
@@ -75,7 +75,7 @@ struct tmq_message_t {
SMqConsumeRsp
rsp
;
SMqConsumeRsp
rsp
;
};
};
typedef
struct
SMqClientVg
{
typedef
struct
{
// statistics
// statistics
int64_t
pollCnt
;
int64_t
pollCnt
;
// offset
// offset
...
@@ -86,7 +86,7 @@ typedef struct SMqClientVg {
...
@@ -86,7 +86,7 @@ typedef struct SMqClientVg {
SEpSet
epSet
;
SEpSet
epSet
;
}
SMqClientVg
;
}
SMqClientVg
;
typedef
struct
SMqClientTopic
{
typedef
struct
{
// subscribe info
// subscribe info
int32_t
sqlLen
;
int32_t
sqlLen
;
char
*
sql
;
char
*
sql
;
...
@@ -779,11 +779,9 @@ tmq_message_t* tmq_consumer_poll(tmq_t* tmq, int64_t blocking_time) {
...
@@ -779,11 +779,9 @@ tmq_message_t* tmq_consumer_poll(tmq_t* tmq, int64_t blocking_time) {
param
->
pVg
=
pVg
;
param
->
pVg
=
pVg
;
tsem_init
(
&
param
->
rspSem
,
0
,
0
);
tsem_init
(
&
param
->
rspSem
,
0
,
0
);
SRequestObj
*
pRequest
=
createRequest
(
tmq
->
pTscObj
,
NULL
,
NULL
,
TDMT_VND_CONSUME
);
SRequestObj
*
pRequest
=
createRequest
(
tmq
->
pTscObj
,
NULL
,
NULL
,
TDMT_VND_CONSUME
);
pRequest
->
body
.
requestMsg
=
(
SDataBuf
){.
pData
=
pReq
,
.
len
=
sizeof
(
SMqConsumeReq
),
.
handle
=
NULL
};
pRequest
->
body
.
requestMsg
=
(
SDataBuf
){.
pData
=
pReq
,
.
len
=
sizeof
(
SMqConsumeReq
),
.
handle
=
NULL
};
SMsgSendInfo
*
sendInfo
=
buildMsgInfoImpl
(
pRequest
);
SMsgSendInfo
*
sendInfo
=
buildMsgInfoImpl
(
pRequest
);
sendInfo
->
requestObjRefId
=
0
;
sendInfo
->
requestObjRefId
=
0
;
sendInfo
->
param
=
param
;
sendInfo
->
param
=
param
;
...
...
source/common/src/tmsg.c
浏览文件 @
7ee6657c
...
@@ -34,6 +34,7 @@ int32_t tInitSubmitMsgIter(SSubmitReq *pMsg, SSubmitMsgIter *pIter) {
...
@@ -34,6 +34,7 @@ int32_t tInitSubmitMsgIter(SSubmitReq *pMsg, SSubmitMsgIter *pIter) {
}
}
pIter
->
totalLen
=
pMsg
->
length
;
pIter
->
totalLen
=
pMsg
->
length
;
ASSERT
(
pIter
->
totalLen
>
0
);
pIter
->
len
=
0
;
pIter
->
len
=
0
;
pIter
->
pMsg
=
pMsg
;
pIter
->
pMsg
=
pMsg
;
if
(
pMsg
->
length
<=
sizeof
(
SSubmitReq
))
{
if
(
pMsg
->
length
<=
sizeof
(
SSubmitReq
))
{
...
@@ -52,6 +53,7 @@ int32_t tGetSubmitMsgNext(SSubmitMsgIter *pIter, SSubmitBlk **pPBlock) {
...
@@ -52,6 +53,7 @@ int32_t tGetSubmitMsgNext(SSubmitMsgIter *pIter, SSubmitBlk **pPBlock) {
}
else
{
}
else
{
SSubmitBlk
*
pSubmitBlk
=
(
SSubmitBlk
*
)
POINTER_SHIFT
(
pIter
->
pMsg
,
pIter
->
len
);
SSubmitBlk
*
pSubmitBlk
=
(
SSubmitBlk
*
)
POINTER_SHIFT
(
pIter
->
pMsg
,
pIter
->
len
);
pIter
->
len
+=
(
sizeof
(
SSubmitBlk
)
+
pSubmitBlk
->
dataLen
+
pSubmitBlk
->
schemaLen
);
pIter
->
len
+=
(
sizeof
(
SSubmitBlk
)
+
pSubmitBlk
->
dataLen
+
pSubmitBlk
->
schemaLen
);
ASSERT
(
pIter
->
len
>
0
);
}
}
if
(
pIter
->
len
>
pIter
->
totalLen
)
{
if
(
pIter
->
len
>
pIter
->
totalLen
)
{
...
...
source/dnode/vnode/inc/vnode.h
浏览文件 @
7ee6657c
...
@@ -226,9 +226,9 @@ static FORCE_INLINE int tqReadHandleSetTbUidList(STqReadHandle *pHandle, const S
...
@@ -226,9 +226,9 @@ static FORCE_INLINE int tqReadHandleSetTbUidList(STqReadHandle *pHandle, const S
return
0
;
return
0
;
}
}
void
tqReadHandleSetMsg
(
STqReadHandle
*
pHandle
,
SSubmitReq
*
pMsg
,
int64_t
ver
);
int32_t
tqReadHandleSetMsg
(
STqReadHandle
*
pHandle
,
SSubmitReq
*
pMsg
,
int64_t
ver
);
bool
tqNextDataBlock
(
STqReadHandle
*
pHandle
);
bool
tqNextDataBlock
(
STqReadHandle
*
pHandle
);
int
tqRetrieveDataBlockInfo
(
STqReadHandle
*
pHandle
,
SDataBlockInfo
*
pBlockInfo
);
int
tqRetrieveDataBlockInfo
(
STqReadHandle
*
pHandle
,
SDataBlockInfo
*
pBlockInfo
);
// return SArray<SColumnInfoData>
// return SArray<SColumnInfoData>
SArray
*
tqRetrieveDataBlock
(
STqReadHandle
*
pHandle
);
SArray
*
tqRetrieveDataBlock
(
STqReadHandle
*
pHandle
);
...
...
source/dnode/vnode/src/tq/tqRead.c
浏览文件 @
7ee6657c
...
@@ -31,13 +31,28 @@ STqReadHandle* tqInitSubmitMsgScanner(SMeta* pMeta) {
...
@@ -31,13 +31,28 @@ STqReadHandle* tqInitSubmitMsgScanner(SMeta* pMeta) {
return
pReadHandle
;
return
pReadHandle
;
}
}
void
tqReadHandleSetMsg
(
STqReadHandle
*
pReadHandle
,
SSubmitReq
*
pMsg
,
int64_t
ver
)
{
int32_t
tqReadHandleSetMsg
(
STqReadHandle
*
pReadHandle
,
SSubmitReq
*
pMsg
,
int64_t
ver
)
{
pReadHandle
->
pMsg
=
pMsg
;
pReadHandle
->
pMsg
=
pMsg
;
pMsg
->
length
=
htonl
(
pMsg
->
length
);
pMsg
->
length
=
htonl
(
pMsg
->
length
);
pMsg
->
numOfBlocks
=
htonl
(
pMsg
->
numOfBlocks
);
pMsg
->
numOfBlocks
=
htonl
(
pMsg
->
numOfBlocks
);
tInitSubmitMsgIter
(
pMsg
,
&
pReadHandle
->
msgIter
);
if
(
tInitSubmitMsgIter
(
pMsg
,
&
pReadHandle
->
msgIter
)
<
0
)
return
-
1
;
while
(
true
)
{
if
(
tGetSubmitMsgNext
(
&
pReadHandle
->
msgIter
,
&
pReadHandle
->
pBlock
)
<
0
)
return
-
1
;
if
(
pReadHandle
->
pBlock
==
NULL
)
break
;
pReadHandle
->
pBlock
->
uid
=
htobe64
(
pReadHandle
->
pBlock
->
uid
);
pReadHandle
->
pBlock
->
tid
=
htonl
(
pReadHandle
->
pBlock
->
tid
);
pReadHandle
->
pBlock
->
sversion
=
htonl
(
pReadHandle
->
pBlock
->
sversion
);
pReadHandle
->
pBlock
->
dataLen
=
htonl
(
pReadHandle
->
pBlock
->
dataLen
);
pReadHandle
->
pBlock
->
schemaLen
=
htonl
(
pReadHandle
->
pBlock
->
schemaLen
);
pReadHandle
->
pBlock
->
numOfRows
=
htons
(
pReadHandle
->
pBlock
->
numOfRows
);
}
if
(
tInitSubmitMsgIter
(
pMsg
,
&
pReadHandle
->
msgIter
)
<
0
)
return
-
1
;
pReadHandle
->
ver
=
ver
;
pReadHandle
->
ver
=
ver
;
memset
(
&
pReadHandle
->
blkIter
,
0
,
sizeof
(
SSubmitBlkIter
));
memset
(
&
pReadHandle
->
blkIter
,
0
,
sizeof
(
SSubmitBlkIter
));
return
0
;
}
}
bool
tqNextDataBlock
(
STqReadHandle
*
pHandle
)
{
bool
tqNextDataBlock
(
STqReadHandle
*
pHandle
)
{
...
@@ -47,19 +62,19 @@ bool tqNextDataBlock(STqReadHandle* pHandle) {
...
@@ -47,19 +62,19 @@ bool tqNextDataBlock(STqReadHandle* pHandle) {
}
}
if
(
pHandle
->
pBlock
==
NULL
)
return
false
;
if
(
pHandle
->
pBlock
==
NULL
)
return
false
;
pHandle
->
pBlock
->
uid
=
htobe64
(
pHandle
->
pBlock
->
uid
);
/*pHandle->pBlock->uid = htobe64(pHandle->pBlock->uid);*/
/*if (pHandle->tbUid == pHandle->pBlock->uid) {*/
/*if (pHandle->tbUid == pHandle->pBlock->uid) {*/
ASSERT
(
pHandle
->
tbIdHash
);
ASSERT
(
pHandle
->
tbIdHash
);
void
*
ret
=
taosHashGet
(
pHandle
->
tbIdHash
,
&
pHandle
->
pBlock
->
uid
,
sizeof
(
int64_t
));
void
*
ret
=
taosHashGet
(
pHandle
->
tbIdHash
,
&
pHandle
->
pBlock
->
uid
,
sizeof
(
int64_t
));
if
(
ret
!=
NULL
)
{
if
(
ret
!=
NULL
)
{
/*printf("retrieve one tb %ld\n", pHandle->pBlock->uid);*/
/*printf("retrieve one tb %ld\n", pHandle->pBlock->uid);*/
pHandle
->
pBlock
->
tid
=
htonl
(
pHandle
->
pBlock
->
tid
);
/*pHandle->pBlock->tid = htonl(pHandle->pBlock->tid);*/
pHandle
->
pBlock
->
sversion
=
htonl
(
pHandle
->
pBlock
->
sversion
);
/*pHandle->pBlock->sversion = htonl(pHandle->pBlock->sversion);*/
pHandle
->
pBlock
->
dataLen
=
htonl
(
pHandle
->
pBlock
->
dataLen
);
/*pHandle->pBlock->dataLen = htonl(pHandle->pBlock->dataLen);*/
pHandle
->
pBlock
->
schemaLen
=
htonl
(
pHandle
->
pBlock
->
schemaLen
);
/*pHandle->pBlock->schemaLen = htonl(pHandle->pBlock->schemaLen);*/
pHandle
->
pBlock
->
numOfRows
=
htons
(
pHandle
->
pBlock
->
numOfRows
);
/*pHandle->pBlock->numOfRows = htons(pHandle->pBlock->numOfRows);*/
return
true
;
return
true
;
}
else
{
/*} else {*/
/*printf("skip one tb %ld\n", pHandle->pBlock->uid);*/
/*printf("skip one tb %ld\n", pHandle->pBlock->uid);*/
}
}
}
}
...
...
source/libs/executor/src/executor.c
浏览文件 @
7ee6657c
...
@@ -14,9 +14,9 @@
...
@@ -14,9 +14,9 @@
*/
*/
#include "executor.h"
#include "executor.h"
#include "tq.h"
#include "executorimpl.h"
#include "executorimpl.h"
#include "planner.h"
#include "planner.h"
#include "tq.h"
static
int32_t
doSetStreamBlock
(
SOperatorInfo
*
pOperator
,
void
*
input
,
char
*
id
)
{
static
int32_t
doSetStreamBlock
(
SOperatorInfo
*
pOperator
,
void
*
input
,
char
*
id
)
{
ASSERT
(
pOperator
!=
NULL
);
ASSERT
(
pOperator
!=
NULL
);
...
@@ -34,7 +34,10 @@ static int32_t doSetStreamBlock(SOperatorInfo* pOperator, void* input, char* id)
...
@@ -34,7 +34,10 @@ static int32_t doSetStreamBlock(SOperatorInfo* pOperator, void* input, char* id)
return
doSetStreamBlock
(
pOperator
->
pDownstream
[
0
],
input
,
id
);
return
doSetStreamBlock
(
pOperator
->
pDownstream
[
0
],
input
,
id
);
}
else
{
}
else
{
SStreamBlockScanInfo
*
pInfo
=
pOperator
->
info
;
SStreamBlockScanInfo
*
pInfo
=
pOperator
->
info
;
tqReadHandleSetMsg
(
pInfo
->
readerHandle
,
input
,
0
);
if
(
tqReadHandleSetMsg
(
pInfo
->
readerHandle
,
input
,
0
)
<
0
)
{
qError
(
"submit msg error while set stream msg, %s"
PRIx64
,
id
);
return
TSDB_CODE_QRY_APP_ERROR
;
}
return
TSDB_CODE_SUCCESS
;
return
TSDB_CODE_SUCCESS
;
}
}
}
}
...
@@ -48,9 +51,9 @@ int32_t qSetStreamInput(qTaskInfo_t tinfo, const void* input) {
...
@@ -48,9 +51,9 @@ int32_t qSetStreamInput(qTaskInfo_t tinfo, const void* input) {
return
TSDB_CODE_SUCCESS
;
return
TSDB_CODE_SUCCESS
;
}
}
SExecTaskInfo
*
pTaskInfo
=
(
SExecTaskInfo
*
)
tinfo
;
SExecTaskInfo
*
pTaskInfo
=
(
SExecTaskInfo
*
)
tinfo
;
int32_t
code
=
doSetStreamBlock
(
pTaskInfo
->
pRoot
,
(
void
*
)
input
,
GET_TASKID
(
pTaskInfo
));
int32_t
code
=
doSetStreamBlock
(
pTaskInfo
->
pRoot
,
(
void
*
)
input
,
GET_TASKID
(
pTaskInfo
));
if
(
code
!=
TSDB_CODE_SUCCESS
)
{
if
(
code
!=
TSDB_CODE_SUCCESS
)
{
qError
(
"%s failed to set the stream block data"
,
GET_TASKID
(
pTaskInfo
));
qError
(
"%s failed to set the stream block data"
,
GET_TASKID
(
pTaskInfo
));
}
else
{
}
else
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录