Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
93993d07
T
TDengine
项目概览
taosdata
/
TDengine
1 年多 前同步成功
通知
1185
Star
22016
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看板
提交
93993d07
编写于
6月 10, 2021
作者:
K
Kaili Xu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[TD-4666]<feature>: support max column num to 4096
上级
92ffa40b
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
20 addition
and
11 deletion
+20
-11
src/client/inc/tsclient.h
src/client/inc/tsclient.h
+1
-0
src/client/src/tscSQLParser.c
src/client/src/tscSQLParser.c
+8
-3
src/client/src/tscServer.c
src/client/src/tscServer.c
+8
-6
src/client/src/tscUtil.c
src/client/src/tscUtil.c
+1
-0
src/inc/taosdef.h
src/inc/taosdef.h
+2
-2
tests/examples/lua/luaconnector.so
tests/examples/lua/luaconnector.so
+0
-0
未找到文件。
src/client/inc/tsclient.h
浏览文件 @
93993d07
...
@@ -242,6 +242,7 @@ typedef struct SSqlObj {
...
@@ -242,6 +242,7 @@ typedef struct SSqlObj {
void
*
pStream
;
void
*
pStream
;
void
*
pSubscription
;
void
*
pSubscription
;
char
*
sqlstr
;
char
*
sqlstr
;
void
*
pBuf
;
// tableMeta buffer
char
parseRetry
;
char
parseRetry
;
char
retry
;
char
retry
;
char
maxRetry
;
char
maxRetry
;
...
...
src/client/src/tscSQLParser.c
浏览文件 @
93993d07
...
@@ -7502,8 +7502,13 @@ int32_t loadAllTableMeta(SSqlObj* pSql, struct SSqlInfo* pInfo) {
...
@@ -7502,8 +7502,13 @@ int32_t loadAllTableMeta(SSqlObj* pSql, struct SSqlInfo* pInfo) {
uint32_t
maxSize
=
tscGetTableMetaMaxSize
();
uint32_t
maxSize
=
tscGetTableMetaMaxSize
();
char
name
[
TSDB_TABLE_FNAME_LEN
]
=
{
0
};
char
name
[
TSDB_TABLE_FNAME_LEN
]
=
{
0
};
char
buf
[
80
*
1024
]
=
{
0
};
// char buf[80 * 1024] = {0};
assert
(
maxSize
<
80
*
1024
);
assert
(
maxSize
<
80
*
TSDB_MAX_COLUMNS
);
if
(
!
pSql
->
pBuf
)
{
if
(
NULL
==
(
pSql
->
pBuf
=
calloc
(
1
,
80
*
TSDB_MAX_COLUMNS
)))
{
return
TSDB_CODE_TSC_OUT_OF_MEMORY
;
}
}
pTableMeta
=
calloc
(
1
,
maxSize
);
pTableMeta
=
calloc
(
1
,
maxSize
);
plist
=
taosArrayInit
(
4
,
POINTER_BYTES
);
plist
=
taosArrayInit
(
4
,
POINTER_BYTES
);
...
@@ -7520,7 +7525,7 @@ int32_t loadAllTableMeta(SSqlObj* pSql, struct SSqlInfo* pInfo) {
...
@@ -7520,7 +7525,7 @@ int32_t loadAllTableMeta(SSqlObj* pSql, struct SSqlInfo* pInfo) {
if
(
pTableMeta
->
id
.
uid
>
0
)
{
if
(
pTableMeta
->
id
.
uid
>
0
)
{
if
(
pTableMeta
->
tableType
==
TSDB_CHILD_TABLE
)
{
if
(
pTableMeta
->
tableType
==
TSDB_CHILD_TABLE
)
{
code
=
tscCreateTableMetaFromSTableMeta
(
pTableMeta
,
name
,
b
uf
);
code
=
tscCreateTableMetaFromSTableMeta
(
pTableMeta
,
name
,
pSql
->
pB
uf
);
// create the child table meta from super table failed, try load it from mnode
// create the child table meta from super table failed, try load it from mnode
if
(
code
!=
TSDB_CODE_SUCCESS
)
{
if
(
code
!=
TSDB_CODE_SUCCESS
)
{
...
...
src/client/src/tscServer.c
浏览文件 @
93993d07
...
@@ -2509,22 +2509,25 @@ int32_t tscGetTableMetaImpl(SSqlObj* pSql, STableMetaInfo *pTableMetaInfo, bool
...
@@ -2509,22 +2509,25 @@ int32_t tscGetTableMetaImpl(SSqlObj* pSql, STableMetaInfo *pTableMetaInfo, bool
taosHashGetClone
(
tscTableMetaInfo
,
name
,
len
,
NULL
,
pTableMetaInfo
->
pTableMeta
,
-
1
);
taosHashGetClone
(
tscTableMetaInfo
,
name
,
len
,
NULL
,
pTableMetaInfo
->
pTableMeta
,
-
1
);
// TODO resize the tableMeta
// TODO resize the tableMeta
char
buf
[
80
*
1024
]
=
{
0
};
// char buf[80 * TSDB_MAX_COLUMNS] = {0};
assert
(
size
<
80
*
1024
);
assert
(
size
<
80
*
TSDB_MAX_COLUMNS
);
if
(
!
pSql
->
pBuf
)
{
if
(
NULL
==
(
pSql
->
pBuf
=
calloc
(
1
,
80
*
TSDB_MAX_COLUMNS
)))
{
return
TSDB_CODE_TSC_OUT_OF_MEMORY
;
}
}
STableMeta
*
pMeta
=
pTableMetaInfo
->
pTableMeta
;
STableMeta
*
pMeta
=
pTableMetaInfo
->
pTableMeta
;
if
(
pMeta
->
id
.
uid
>
0
)
{
if
(
pMeta
->
id
.
uid
>
0
)
{
// in case of child table, here only get the
// in case of child table, here only get the
if
(
pMeta
->
tableType
==
TSDB_CHILD_TABLE
)
{
if
(
pMeta
->
tableType
==
TSDB_CHILD_TABLE
)
{
int32_t
code
=
tscCreateTableMetaFromSTableMeta
(
pTableMetaInfo
->
pTableMeta
,
name
,
b
uf
);
int32_t
code
=
tscCreateTableMetaFromSTableMeta
(
pTableMetaInfo
->
pTableMeta
,
name
,
pSql
->
pB
uf
);
if
(
code
!=
TSDB_CODE_SUCCESS
)
{
if
(
code
!=
TSDB_CODE_SUCCESS
)
{
return
getTableMetaFromMnode
(
pSql
,
pTableMetaInfo
,
autocreate
);
return
getTableMetaFromMnode
(
pSql
,
pTableMetaInfo
,
autocreate
);
}
}
}
}
return
TSDB_CODE_SUCCESS
;
return
TSDB_CODE_SUCCESS
;
}
}
return
getTableMetaFromMnode
(
pSql
,
pTableMetaInfo
,
autocreate
);
return
getTableMetaFromMnode
(
pSql
,
pTableMetaInfo
,
autocreate
);
}
}
...
@@ -2585,7 +2588,6 @@ int tscGetSTableVgroupInfo(SSqlObj *pSql, SQueryInfo* pQueryInfo) {
...
@@ -2585,7 +2588,6 @@ int tscGetSTableVgroupInfo(SSqlObj *pSql, SQueryInfo* pQueryInfo) {
if
(
allVgroupInfoRetrieved
(
pQueryInfo
))
{
if
(
allVgroupInfoRetrieved
(
pQueryInfo
))
{
return
TSDB_CODE_SUCCESS
;
return
TSDB_CODE_SUCCESS
;
}
}
SSqlObj
*
pNew
=
calloc
(
1
,
sizeof
(
SSqlObj
));
SSqlObj
*
pNew
=
calloc
(
1
,
sizeof
(
SSqlObj
));
pNew
->
pTscObj
=
pSql
->
pTscObj
;
pNew
->
pTscObj
=
pSql
->
pTscObj
;
pNew
->
signature
=
pNew
;
pNew
->
signature
=
pNew
;
...
...
src/client/src/tscUtil.c
浏览文件 @
93993d07
...
@@ -1402,6 +1402,7 @@ void tscFreeSqlObj(SSqlObj* pSql) {
...
@@ -1402,6 +1402,7 @@ void tscFreeSqlObj(SSqlObj* pSql) {
pSql
->
signature
=
NULL
;
pSql
->
signature
=
NULL
;
pSql
->
fp
=
NULL
;
pSql
->
fp
=
NULL
;
tfree
(
pSql
->
sqlstr
);
tfree
(
pSql
->
sqlstr
);
tfree
(
pSql
->
pBuf
);
tfree
(
pSql
->
pSubs
);
tfree
(
pSql
->
pSubs
);
pSql
->
subState
.
numOfSub
=
0
;
pSql
->
subState
.
numOfSub
=
0
;
...
...
src/inc/taosdef.h
浏览文件 @
93993d07
...
@@ -178,7 +178,7 @@ do { \
...
@@ -178,7 +178,7 @@ do { \
// 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
1024
#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
...
@@ -193,7 +193,7 @@ do { \
...
@@ -193,7 +193,7 @@ do { \
#define TSDB_APPNAME_LEN TSDB_UNI_LEN
#define TSDB_APPNAME_LEN TSDB_UNI_LEN
#define TSDB_MAX_BYTES_PER_ROW
16384
#define TSDB_MAX_BYTES_PER_ROW
65536
#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
...
...
tests/examples/lua/luaconnector.so
0 → 100755
浏览文件 @
93993d07
文件已添加
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录