Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
慢慢CG
TDengine
提交
07170492
T
TDengine
项目概览
慢慢CG
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
TDengine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
未验证
提交
07170492
编写于
6月 25, 2020
作者:
S
Shengliang Guan
提交者:
GitHub
6月 25, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #2448 from taosdata/feature/query
Feature/query
上级
943da9bb
1ed5309d
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
109 addition
and
149 deletion
+109
-149
src/client/inc/tsclient.h
src/client/inc/tsclient.h
+2
-6
src/client/src/tscParseInsert.c
src/client/src/tscParseInsert.c
+96
-137
src/client/src/tscServer.c
src/client/src/tscServer.c
+5
-1
src/client/src/tscUtil.c
src/client/src/tscUtil.c
+1
-1
src/inc/taosdef.h
src/inc/taosdef.h
+1
-1
src/kit/taosdemo/taosdemo.c
src/kit/taosdemo/taosdemo.c
+4
-3
未找到文件。
src/client/inc/tsclient.h
浏览文件 @
07170492
...
...
@@ -171,11 +171,7 @@ typedef struct STableDataBlocks {
* to avoid it to be removed from cache
*/
STableMeta
*
pTableMeta
;
union
{
char
*
filename
;
char
*
pData
;
};
char
*
pData
;
// for parameter ('?') binding
uint32_t
numOfAllocedParams
;
...
...
@@ -398,7 +394,7 @@ void waitForQueryRsp(void *param, TAOS_RES *tres, int code) ;
int
doAsyncParseSql
(
SSqlObj
*
pSql
);
void
doAsyncQuery
(
STscObj
*
pObj
,
SSqlObj
*
pSql
,
void
(
*
fp
)(),
void
*
param
,
const
char
*
sqlstr
,
size_t
sqlLen
);
void
tscProcessMultiVnodesI
nse
rtFromFile
(
SSqlObj
*
pSql
);
void
tscProcessMultiVnodesI
mpo
rtFromFile
(
SSqlObj
*
pSql
);
void
tscKillSTableQuery
(
SSqlObj
*
pSql
);
void
tscInitResObjForLocalQuery
(
SSqlObj
*
pObj
,
int32_t
numOfRes
,
int32_t
rowLen
);
bool
tscIsUpdateQuery
(
SSqlObj
*
pSql
);
...
...
src/client/src/tscParseInsert.c
浏览文件 @
07170492
...
...
@@ -1153,29 +1153,19 @@ int tsParseInsertSql(SSqlObj *pSql) {
goto
_error
;
}
char
fname
[
PATH_MAX
]
=
{
0
};
strncpy
(
fname
,
sToken
.
z
,
sToken
.
n
);
strdequote
(
fname
);
strncpy
(
pCmd
->
payload
,
sToken
.
z
,
sToken
.
n
);
strdequote
(
pCmd
->
payload
);
// todo refactor extract method
wordexp_t
full_path
;
if
(
wordexp
(
fname
,
&
full_path
,
0
)
!=
0
)
{
if
(
wordexp
(
pCmd
->
payload
,
&
full_path
,
0
)
!=
0
)
{
code
=
tscInvalidSQLErrMsg
(
pCmd
->
payload
,
"invalid filename"
,
sToken
.
z
);
goto
_error
;
}
strcpy
(
fname
,
full_path
.
we_wordv
[
0
]);
wordfree
(
&
full_path
);
STableDataBlocks
*
pDataBlock
=
NULL
;
STableMeta
*
pTableMeta
=
pTableMetaInfo
->
pTableMeta
;
int32_t
ret
=
tscCreateDataBlock
(
PATH_MAX
,
tinfo
.
rowSize
,
sizeof
(
SSubmitBlk
),
pTableMetaInfo
->
name
,
pTableMeta
,
&
pDataBlock
);
if
(
ret
!=
TSDB_CODE_SUCCESS
)
{
goto
_error
;
}
tstrncpy
(
pCmd
->
payload
,
full_path
.
we_wordv
[
0
],
pCmd
->
allocSize
);
wordfree
(
&
full_path
);
taosArrayPush
(
pCmd
->
pDataBlocks
,
&
pDataBlock
);
strcpy
(
pDataBlock
->
filename
,
fname
);
}
else
if
(
sToken
.
type
==
TK_LP
)
{
/* insert into tablename(col1, col2,..., coln) values(v1, v2,... vn); */
STableMeta
*
pTableMeta
=
tscGetTableMetaInfoFromCmd
(
pCmd
,
pCmd
->
clauseIndex
,
0
)
->
pTableMeta
;
...
...
@@ -1377,172 +1367,141 @@ static int doPackSendDataBlock(SSqlObj *pSql, int32_t numOfRows, STableDataBlock
return
code
;
}
if
((
code
=
tscProcessSql
(
pSql
))
!=
TSDB_CODE_SUCCESS
)
{
return
code
;
return
tscProcessSql
(
pSql
);
}
typedef
struct
SImportFileSupport
{
SSqlObj
*
pSql
;
FILE
*
fp
;
}
SImportFileSupport
;
static
void
parseFileSendDataBlock
(
void
*
param
,
TAOS_RES
*
tres
,
int
code
)
{
assert
(
param
!=
NULL
&&
tres
!=
NULL
);
SSqlObj
*
pSql
=
tres
;
SSqlCmd
*
pCmd
=
&
pSql
->
cmd
;
SImportFileSupport
*
pSupporter
=
(
SImportFileSupport
*
)
param
;
SSqlObj
*
pParentSql
=
pSupporter
->
pSql
;
FILE
*
fp
=
pSupporter
->
fp
;
if
(
taos_errno
(
pSql
)
!=
TSDB_CODE_SUCCESS
)
{
// handle error
assert
(
taos_errno
(
pSql
)
==
code
);
taos_free_result
(
pSql
);
tfree
(
pSupporter
);
fclose
(
fp
);
pParentSql
->
res
.
code
=
code
;
return
;
}
return
TSDB_CODE_SUCCESS
;
}
// accumulate the total submit records
pParentSql
->
res
.
numOfRows
+=
pSql
->
res
.
numOfRows
;
static
int
tscInsertDataFromFile
(
SSqlObj
*
pSql
,
FILE
*
fp
,
char
*
tmpTokenBuf
)
{
size_t
readLen
=
0
;
char
*
line
=
NULL
;
size_t
n
=
0
;
int
len
=
0
;
int32_t
maxRows
=
0
;
SSqlCmd
*
pCmd
=
&
pSql
->
cmd
;
int
numOfRows
=
0
;
int32_t
code
=
0
;
int
nrows
=
0
;
STableMetaInfo
*
pTableMetaInfo
=
tscGetTableMetaInfoFromCmd
(
pCmd
,
pCmd
->
clauseIndex
,
0
);
STableMeta
*
pTableMeta
=
pTableMetaInfo
->
pTableMeta
;
STableComInfo
tinfo
=
tscGetTableInfo
(
pTableMeta
);
assert
(
pCmd
->
numOfClause
==
1
);
int32_t
rowSize
=
tinfo
.
rowSize
;
SSchema
*
pSchema
=
tscGetTableSchema
(
pTableMeta
);
STableComInfo
tinfo
=
tscGetTableInfo
(
pTableMeta
);
pCmd
->
pDataBlocks
=
taosArrayInit
(
4
,
POINTER_BYTES
);
STableDataBlocks
*
pTableDataBlock
=
NULL
;
SParsedDataColInfo
spd
=
{.
numOfCols
=
tinfo
.
numOfColumns
};
tscSetAssignedColumnInfo
(
&
spd
,
pSchema
,
tinfo
.
numOfColumns
);
size_t
n
=
0
;
ssize_t
readLen
=
0
;
char
*
line
=
NULL
;
int32_t
count
=
0
;
int32_t
maxRows
=
0
;
int32_t
ret
=
tscCreateDataBlock
(
TSDB_PAYLOAD_SIZE
,
rowSize
,
sizeof
(
SSubmitBlk
),
pTableMetaInfo
->
name
,
pTableMeta
,
&
pTableDataBlock
);
tscDestroyBlockArrayList
(
pSql
->
cmd
.
pDataBlocks
);
pCmd
->
pDataBlocks
=
taosArrayInit
(
1
,
POINTER_BYTES
);
STableDataBlocks
*
pTableDataBlock
=
NULL
;
int32_t
ret
=
tscCreateDataBlock
(
TSDB_PAYLOAD_SIZE
,
tinfo
.
rowSize
,
sizeof
(
SSubmitBlk
),
pTableMetaInfo
->
name
,
pTableMeta
,
&
pTableDataBlock
);
if
(
ret
!=
TSDB_CODE_SUCCESS
)
{
return
ret
;
//
return ret;
}
taosArrayPush
(
pCmd
->
pDataBlocks
,
&
pTableDataBlock
);
tscAllocateMemIfNeed
(
pTableDataBlock
,
tinfo
.
rowSize
,
&
maxRows
);
code
=
tscAllocateMemIfNeed
(
pTableDataBlock
,
rowSize
,
&
maxRows
);
if
(
TSDB_CODE_SUCCESS
!=
code
)
return
-
1
;
int
count
=
0
;
SParsedDataColInfo
spd
=
{.
numOfCols
=
tinfo
.
numOfColumns
};
SSchema
*
pSchema
=
tscGetTableSchema
(
pTableMeta
);
tscSetAssignedColumnInfo
(
&
spd
,
pSchema
,
tinfo
.
numOfColumns
);
char
*
tokenBuf
=
calloc
(
1
,
4096
);
while
((
readLen
=
getline
(
&
line
,
&
n
,
fp
))
!=
-
1
)
{
// line[--readLen] = '\0';
if
((
'\r'
==
line
[
readLen
-
1
])
||
(
'\n'
==
line
[
readLen
-
1
]))
line
[
--
readLen
]
=
0
;
if
(
readLen
==
0
)
continue
;
// fang, <= to ==
if
((
'\r'
==
line
[
readLen
-
1
])
||
(
'\n'
==
line
[
readLen
-
1
]))
{
line
[
--
readLen
]
=
0
;
}
if
(
readLen
==
0
)
{
continue
;
}
char
*
lineptr
=
line
;
strtolower
(
line
,
line
);
len
=
tsParseOneRowData
(
&
lineptr
,
pTableDataBlock
,
pSchema
,
&
spd
,
pCmd
->
payload
,
tinfo
.
precision
,
&
code
,
tmpTokenBuf
);
int32_t
len
=
tsParseOneRowData
(
&
lineptr
,
pTableDataBlock
,
pSchema
,
&
spd
,
pCmd
->
payload
,
tinfo
.
precision
,
&
code
,
tokenBuf
);
if
(
len
<=
0
||
pTableDataBlock
->
numOfParams
>
0
)
{
pSql
->
res
.
code
=
code
;
return
(
-
code
)
;
break
;
}
pTableDataBlock
->
size
+=
len
;
count
++
;
nrows
++
;
if
(
count
>=
maxRows
)
{
if
((
code
=
doPackSendDataBlock
(
pSql
,
count
,
pTableDataBlock
))
!=
TSDB_CODE_SUCCESS
)
{
return
-
code
;
}
pTableDataBlock
=
taosArrayGetP
(
pCmd
->
pDataBlocks
,
0
);
pTableDataBlock
->
size
=
sizeof
(
SSubmitBlk
);
pTableDataBlock
->
rowSize
=
tinfo
.
rowSize
;
numOfRows
+=
pSql
->
res
.
numOfRows
;
pSql
->
res
.
numOfRows
=
0
;
count
=
0
;
if
(
++
count
>=
maxRows
)
{
break
;
}
}
tfree
(
tokenBuf
);
free
(
line
);
if
(
count
>
0
)
{
if
((
code
=
doPackSendDataBlock
(
pSql
,
count
,
pTableDataBlock
))
!=
TSDB_CODE_SUCCESS
)
{
return
-
code
;
pParentSql
->
res
.
code
=
code
;
}
numOfRows
+=
pSql
->
res
.
numOfRows
;
pSql
->
res
.
numOfRows
=
0
;
}
}
else
{
taos_free_result
(
pSql
);
tfree
(
pSupporter
);
fclose
(
fp
);
if
(
line
)
tfree
(
line
)
;
pParentSql
->
fp
=
pParentSql
->
fetchFp
;
return
numOfRows
;
// all data has been sent to vnode, call user function
int32_t
v
=
(
pParentSql
->
res
.
code
!=
TSDB_CODE_SUCCESS
)
?
pParentSql
->
res
.
code
:
pParentSql
->
res
.
numOfRows
;
(
*
pParentSql
->
fp
)(
pParentSql
->
param
,
pParentSql
,
v
);
}
}
void
tscProcessMultiVnodesI
nse
rtFromFile
(
SSqlObj
*
pSql
)
{
void
tscProcessMultiVnodesI
mpo
rtFromFile
(
SSqlObj
*
pSql
)
{
SSqlCmd
*
pCmd
=
&
pSql
->
cmd
;
if
(
pCmd
->
command
!=
TSDB_SQL_INSERT
)
{
return
;
}
SQueryInfo
*
pQueryInfo
=
tscGetQueryInfoDetail
(
pCmd
,
0
);
STableMetaInfo
*
pTableMetaInfo
=
tscGetMetaInfo
(
pQueryInfo
,
0
);
STableDataBlocks
*
pDataBlock
=
NULL
;
int32_t
affected_rows
=
0
;
assert
(
pCmd
->
dataSourceType
==
DATA_FROM_DATA_FILE
&&
pCmd
->
pDataBlocks
!=
NULL
);
SArray
*
pDataBlockList
=
pCmd
->
pDataBlocks
;
pCmd
->
pDataBlocks
=
NULL
;
char
path
[
PATH_MAX
]
=
{
0
};
size_t
size
=
taosArrayGetSize
(
pDataBlockList
);
for
(
int32_t
i
=
0
;
i
<
size
;
++
i
)
{
pDataBlock
=
taosArrayGetP
(
pDataBlockList
,
i
);
if
(
pDataBlock
==
NULL
)
{
continue
;
}
if
(
TSDB_CODE_SUCCESS
!=
tscAllocPayload
(
pCmd
,
TSDB_PAYLOAD_SIZE
))
{
tscError
(
"%p failed to malloc when insert file"
,
pSql
);
continue
;
}
pCmd
->
count
=
1
;
tstrncpy
(
path
,
pDataBlock
->
filename
,
sizeof
(
path
));
FILE
*
fp
=
fopen
(
path
,
"r"
);
if
(
fp
==
NULL
)
{
tscError
(
"%p failed to open file %s to load data from file, reason:%s"
,
pSql
,
path
,
strerror
(
errno
));
continue
;
}
tstrncpy
(
pTableMetaInfo
->
name
,
pDataBlock
->
tableId
,
sizeof
(
pTableMetaInfo
->
name
));
memset
(
pDataBlock
->
pData
,
0
,
pDataBlock
->
nAllocSize
);
int32_t
ret
=
tscGetTableMeta
(
pSql
,
pTableMetaInfo
);
if
(
ret
!=
TSDB_CODE_SUCCESS
)
{
tscError
(
"%p get meter meta failed, abort"
,
pSql
);
continue
;
}
assert
(
pCmd
->
dataSourceType
==
DATA_FROM_DATA_FILE
&&
strlen
(
pCmd
->
payload
)
!=
0
);
char
*
tmpTokenBuf
=
calloc
(
1
,
4096
);
// used for deleting Escape character: \\, \', \"
if
(
NULL
==
tmpTokenBuf
)
{
tscError
(
"%p calloc failed"
,
pSql
);
continue
;
}
SImportFileSupport
*
pSupporter
=
calloc
(
1
,
sizeof
(
SImportFileSupport
));
SSqlObj
*
pNew
=
createSubqueryObj
(
pSql
,
0
,
parseFileSendDataBlock
,
pSupporter
,
TSDB_SQL_INSERT
,
NULL
);
int
nrows
=
tscInsertDataFromFile
(
pSql
,
fp
,
tmpTokenBuf
);
free
(
tmpTokenBuf
);
pCmd
->
pDataBlocks
=
tscDestroyBlockArrayList
(
pCmd
->
pDataBlocks
);
pNew
->
cmd
.
pDataBlocks
=
taosArrayInit
(
4
,
POINTER_BYTES
);
pCmd
->
count
=
1
;
if
(
nrows
<
0
)
{
fclose
(
fp
);
tscTrace
(
"%p no records(%d) in file %s"
,
pSql
,
nrows
,
path
);
continue
;
}
FILE
*
fp
=
fopen
(
pCmd
->
payload
,
"r"
);
if
(
fp
==
NULL
)
{
pSql
->
res
.
code
=
TAOS_SYSTEM_ERROR
(
errno
);
tscError
(
"%p failed to open file %s to load data from file, code:%s"
,
pSql
,
pCmd
->
payload
,
tstrerror
(
pSql
->
res
.
code
));
fclose
(
fp
);
affected_rows
+=
nrows
;
tfree
(
pSupporter
)
tscQueueAsyncRes
(
pSql
)
;
tscTrace
(
"%p Insert data %d records from file %s"
,
pSql
,
nrows
,
path
)
;
return
;
}
pSql
->
res
.
numOfRows
=
affected_rows
;
pSupporter
->
pSql
=
pSql
;
pSupporter
->
fp
=
fp
;
// all data have been submit to vnode, release data blocks
pCmd
->
pDataBlocks
=
tscDestroyBlockArrayList
(
pCmd
->
pDataBlocks
);
tscDestroyBlockArrayList
(
pDataBlockList
);
parseFileSendDataBlock
(
pSupporter
,
pNew
,
0
);
}
src/client/src/tscServer.c
浏览文件 @
07170492
...
...
@@ -195,7 +195,11 @@ int tscSendMsgToServer(SSqlObj *pSql) {
.
code
=
0
};
pSql
->
pRpcCtx
=
rpcSendRequest
(
pObj
->
pDnodeConn
,
&
pSql
->
ipList
,
&
rpcMsg
);
// NOTE: the rpc context should be acquired before sending data to server.
// Otherwise, the pSql object may have been released already during the response function, which is
// processMsgFromServer function. In the meanwhile, the assignment of the rpc context to sql object will absolutely
// cause crash.
/*pSql->pRpcCtx = */
rpcSendRequest
(
pObj
->
pDnodeConn
,
&
pSql
->
ipList
,
&
rpcMsg
);
return
TSDB_CODE_SUCCESS
;
}
...
...
src/client/src/tscUtil.c
浏览文件 @
07170492
...
...
@@ -1880,7 +1880,7 @@ void tscDoQuery(SSqlObj* pSql) {
}
if
(
pCmd
->
dataSourceType
==
DATA_FROM_DATA_FILE
)
{
tscProcessMultiVnodesI
nse
rtFromFile
(
pSql
);
tscProcessMultiVnodesI
mpo
rtFromFile
(
pSql
);
}
else
{
SQueryInfo
*
pQueryInfo
=
tscGetQueryInfoDetail
(
pCmd
,
pCmd
->
clauseIndex
);
uint16_t
type
=
pQueryInfo
->
type
;
...
...
src/inc/taosdef.h
浏览文件 @
07170492
...
...
@@ -245,7 +245,7 @@ void tsDataSwap(void *pLeft, void *pRight, int32_t type, int32_t size);
#define TSDB_DEFAULT_PKT_SIZE 65480 //same as RPC_MAX_UDP_SIZE
#define TSDB_PAYLOAD_SIZE TSDB_DEFAULT_PKT_SIZE
#define TSDB_DEFAULT_PAYLOAD_SIZE
2048 // default payload siz
e
#define TSDB_DEFAULT_PAYLOAD_SIZE
5120 // default payload size, greater than PATH_MAX valu
e
#define TSDB_EXTRA_PAYLOAD_SIZE 128 // extra bytes for auth
#define TSDB_CQ_SQL_SIZE 1024
#define TSDB_MAX_VNODES 256
...
...
src/kit/taosdemo/taosdemo.c
浏览文件 @
07170492
...
...
@@ -470,11 +470,12 @@ int main(int argc, char *argv[]) {
char
command
[
BUFFER_SIZE
]
=
"
\0
"
;
sprintf
(
command
,
"drop database %s;"
,
db_name
);
taos_query
(
taos
,
command
);
TAOS_RES
*
res
=
taos_query
(
taos
,
command
);
taos_free_result
(
res
);
sprintf
(
command
,
"create database %s;"
,
db_name
);
taos_query
(
taos
,
command
);
res
=
taos_query
(
taos
,
command
);
taos_free_result
(
res
);
char
cols
[
STRING_LEN
]
=
"
\0
"
;
int
colIndex
=
0
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录