Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
哥们要飞
TDengine
提交
f139f1a6
T
TDengine
项目概览
哥们要飞
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
1
Star
1
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看板
体验新版 GitCode,发现更多精彩内容 >>
提交
f139f1a6
编写于
6月 19, 2020
作者:
S
Shengliang Guan
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'develop' of
https://github.com/taosdata/TDengine
into develop
上级
a3bdfdbb
736dbb18
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
71 addition
and
69 deletion
+71
-69
src/client/src/tscLocalMerge.c
src/client/src/tscLocalMerge.c
+10
-10
src/client/src/tscSQLParser.c
src/client/src/tscSQLParser.c
+1
-1
src/client/src/tscServer.c
src/client/src/tscServer.c
+2
-1
src/client/src/tscSql.c
src/client/src/tscSql.c
+3
-1
src/client/src/tscSubquery.c
src/client/src/tscSubquery.c
+7
-8
src/kit/shell/src/shellEngine.c
src/kit/shell/src/shellEngine.c
+25
-18
src/kit/shell/src/shellMain.c
src/kit/shell/src/shellMain.c
+0
-9
src/kit/taosdump/taosdump.c
src/kit/taosdump/taosdump.c
+15
-12
src/query/inc/qextbuffer.h
src/query/inc/qextbuffer.h
+1
-1
src/query/src/qextbuffer.c
src/query/src/qextbuffer.c
+7
-8
未找到文件。
src/client/src/tscLocalMerge.c
浏览文件 @
f139f1a6
...
...
@@ -413,13 +413,13 @@ static int32_t tscFlushTmpBufferImpl(tExtMemBuffer *pMemoryBuf, tOrderDescriptor
}
int32_t
tscFlushTmpBuffer
(
tExtMemBuffer
*
pMemoryBuf
,
tOrderDescriptor
*
pDesc
,
tFilePage
*
pPage
,
int32_t
orderType
)
{
int32_t
ret
=
tscFlushTmpBufferImpl
(
pMemoryBuf
,
pDesc
,
pPage
,
orderType
)
;
if
(
ret
!=
0
)
{
return
-
1
;
int32_t
ret
=
0
;
if
(
(
ret
=
tscFlushTmpBufferImpl
(
pMemoryBuf
,
pDesc
,
pPage
,
orderType
))
!=
0
)
{
return
ret
;
}
if
(
!
tExtMemBufferFlush
(
pMemoryBuf
)
)
{
return
-
1
;
if
(
(
ret
=
tExtMemBufferFlush
(
pMemoryBuf
))
!=
0
)
{
return
ret
;
}
return
0
;
...
...
@@ -440,9 +440,9 @@ int32_t saveToBuffer(tExtMemBuffer *pMemoryBuf, tOrderDescriptor *pDesc, tFilePa
// current buffer is full, need to flushed to disk
assert
(
pPage
->
num
==
pModel
->
capacity
);
int32_t
ret
=
tscFlushTmpBuffer
(
pMemoryBuf
,
pDesc
,
pPage
,
orderType
);
if
(
ret
!=
0
)
{
return
-
1
;
int32_t
code
=
tscFlushTmpBuffer
(
pMemoryBuf
,
pDesc
,
pPage
,
orderType
);
if
(
code
!=
0
)
{
return
code
;
}
int32_t
remain
=
numOfRows
-
numOfRemainEntries
;
...
...
@@ -458,8 +458,8 @@ int32_t saveToBuffer(tExtMemBuffer *pMemoryBuf, tOrderDescriptor *pDesc, tFilePa
tColModelAppend
(
pModel
,
pPage
,
data
,
numOfRows
-
remain
,
numOfWriteElems
,
numOfRows
);
if
(
pPage
->
num
==
pModel
->
capacity
)
{
if
(
tscFlushTmpBuffer
(
pMemoryBuf
,
pDesc
,
pPage
,
orderType
)
!=
TSDB_CODE_SUCCESS
)
{
return
-
1
;
if
(
(
code
=
tscFlushTmpBuffer
(
pMemoryBuf
,
pDesc
,
pPage
,
orderType
)
)
!=
TSDB_CODE_SUCCESS
)
{
return
code
;
}
}
else
{
pPage
->
num
=
numOfWriteElems
;
...
...
src/client/src/tscSQLParser.c
浏览文件 @
f139f1a6
...
...
@@ -2622,7 +2622,7 @@ static int32_t doExtractColumnFilterInfo(SQueryInfo* pQueryInfo, SColumnFilterIn
tVariantDump
(
&
pRight
->
val
,
(
char
*
)
&
pColumnFilter
->
upperBndd
,
colType
,
false
);
}
else
{
// TK_GT,TK_GE,TK_EQ,TK_NE are based on the pColumn->lowerBndd
if
(
colType
==
TSDB_DATA_TYPE_BINARY
)
{
pColumnFilter
->
pz
=
(
int64_t
)
calloc
(
1
,
pRight
->
val
.
nLen
+
1
);
pColumnFilter
->
pz
=
(
int64_t
)
calloc
(
1
,
pRight
->
val
.
nLen
+
TSDB_NCHAR_SIZE
);
pColumnFilter
->
len
=
pRight
->
val
.
nLen
;
tVariantDump
(
&
pRight
->
val
,
(
char
*
)
pColumnFilter
->
pz
,
colType
,
false
);
...
...
src/client/src/tscServer.c
浏览文件 @
f139f1a6
...
...
@@ -198,6 +198,8 @@ int tscSendMsgToServer(SSqlObj *pSql) {
};
pSql
->
SRpcReqContext
=
rpcSendRequest
(
pObj
->
pDnodeConn
,
&
pSql
->
ipList
,
&
rpcMsg
);
assert
(
pSql
->
SRpcReqContext
!=
NULL
);
return
TSDB_CODE_SUCCESS
;
}
...
...
@@ -412,7 +414,6 @@ void tscKillSTableQuery(SSqlObj *pSql) {
for
(
int
i
=
0
;
i
<
pSql
->
numOfSubs
;
++
i
)
{
SSqlObj
*
pSub
=
pSql
->
pSubs
[
i
];
if
(
pSub
==
NULL
)
{
continue
;
}
...
...
src/client/src/tscSql.c
浏览文件 @
f139f1a6
...
...
@@ -607,7 +607,9 @@ int* taos_fetch_lengths(TAOS_RES *res) {
char
*
taos_get_client_info
()
{
return
version
;
}
void
taos_stop_query
(
TAOS_RES
*
res
)
{
if
(
res
==
NULL
)
return
;
if
(
res
==
NULL
)
{
return
;
}
SSqlObj
*
pSql
=
(
SSqlObj
*
)
res
;
SSqlCmd
*
pCmd
=
&
pSql
->
cmd
;
...
...
src/client/src/tscSubquery.c
浏览文件 @
f139f1a6
...
...
@@ -1492,7 +1492,7 @@ static void tscAbortFurtherRetryRetrieval(SRetrieveSupport *trsupport, TAOS_RES
tscError
(
"sub:%p failed to flush data to disk:reason:%s"
,
tres
,
lpMsgBuf
);
LocalFree
(
lpMsgBuf
);
#else
tscError
(
"sub:%p failed to flush data to disk
:reason:%s"
,
tres
,
strerror
(
errno
));
tscError
(
"sub:%p failed to flush data to disk
, reason:%s"
,
tres
,
tstrerror
(
code
));
#endif
SSqlObj
*
pParentSql
=
trsupport
->
pParentSqlObj
;
...
...
@@ -1501,7 +1501,6 @@ static void tscAbortFurtherRetryRetrieval(SRetrieveSupport *trsupport, TAOS_RES
trsupport
->
numOfRetry
=
MAX_NUM_OF_SUBQUERY_RETRY
;
pthread_mutex_unlock
(
&
trsupport
->
queryMutex
);
tscHandleSubqueryError
(
trsupport
,
tres
,
pParentSql
->
res
.
code
);
}
...
...
@@ -1630,10 +1629,9 @@ static void tscAllDataRetrievedFromDnode(SRetrieveSupport *trsupport, SSqlObj* p
// each result for a vnode is ordered as an independant list,
// then used as an input of loser tree for disk-based merge routine
int32_t
ret
=
tscFlushTmpBuffer
(
trsupport
->
pExtMemBuffer
[
idx
],
pDesc
,
trsupport
->
localBuffer
,
pQueryInfo
->
groupbyExpr
.
orderType
);
if
(
ret
!=
0
)
{
// set no disk space error info, and abort retry
return
tscAbortFurtherRetryRetrieval
(
trsupport
,
pSql
,
TSDB_CODE_TSC_NO_DISKSPACE
);
int32_t
code
=
tscFlushTmpBuffer
(
trsupport
->
pExtMemBuffer
[
idx
],
pDesc
,
trsupport
->
localBuffer
,
pQueryInfo
->
groupbyExpr
.
orderType
);
if
(
code
!=
0
)
{
// set no disk space error info, and abort retry
return
tscAbortFurtherRetryRetrieval
(
trsupport
,
pSql
,
code
);
}
int32_t
remain
=
-
1
;
...
...
@@ -1704,7 +1702,7 @@ static void tscRetrieveFromDnodeCallBack(void *param, TAOS_RES *tres, int numOfR
tscTrace
(
"%p sub:%p retrieve numOfRows:%"
PRId64
" totalNumOfRows:%"
PRIu64
" from ip:%s, orderOfSub:%d"
,
pPObj
,
pSql
,
pRes
->
numOfRows
,
pState
->
numOfRetrievedRows
,
pSql
->
ipList
.
fqdn
[
pSql
->
ipList
.
inUse
],
idx
);
if
(
num
>
tsMaxNumOfOrderedResults
&&
tscIsProjectionQueryOnSTable
(
pQueryInfo
,
0
))
{
tscError
(
"%p sub:%p num of OrderedRes is too many, max allowed:%"
PRId32
" , current:%"
PRId64
,
pPObj
,
pSql
,
tsMaxNumOfOrderedResults
,
num
);
...
...
@@ -1729,7 +1727,7 @@ static void tscRetrieveFromDnodeCallBack(void *param, TAOS_RES *tres, int numOfR
int32_t
ret
=
saveToBuffer
(
trsupport
->
pExtMemBuffer
[
idx
],
pDesc
,
trsupport
->
localBuffer
,
pRes
->
data
,
pRes
->
numOfRows
,
pQueryInfo
->
groupbyExpr
.
orderType
);
if
(
ret
<
0
)
{
// set no disk space error info, and abort retry
if
(
ret
!=
0
)
{
// set no disk space error info, and abort retry
tscAbortFurtherRetryRetrieval
(
trsupport
,
tres
,
TSDB_CODE_TSC_NO_DISKSPACE
);
pthread_mutex_unlock
(
&
trsupport
->
queryMutex
);
...
...
@@ -1988,6 +1986,7 @@ void tscBuildResFromSubqueries(SSqlObj *pSql) {
SColumnIndex
*
pIndex
=
&
pRes
->
pColumnIndex
[
i
];
SSqlRes
*
pRes1
=
&
pSql
->
pSubs
[
pIndex
->
tableIndex
]
->
res
;
pRes
->
tsrow
[
i
]
=
pRes1
->
tsrow
[
pIndex
->
columnIndex
];
pRes
->
length
[
i
]
=
pRes1
->
length
[
pIndex
->
columnIndex
];
}
pRes
->
numOfClauseTotal
++
;
...
...
src/kit/shell/src/shellEngine.c
浏览文件 @
f139f1a6
...
...
@@ -276,6 +276,8 @@ void shellRunCommandOnServer(TAOS *con, char command[]) {
st
=
taosGetTimestampUs
();
TAOS_RES
*
pSql
=
taos_query
(
con
,
command
);
result
=
pSql
;
// set it into the global variable
if
(
taos_errno
(
pSql
))
{
taos_error
(
pSql
);
return
;
...
...
@@ -284,7 +286,8 @@ void shellRunCommandOnServer(TAOS *con, char command[]) {
if
(
regex_match
(
command
,
"^
\\
s*use
\\
s+[a-zA-Z0-9_]+
\\
s*;
\\
s*$"
,
REG_EXTENDED
|
REG_ICASE
))
{
fprintf
(
stdout
,
"Database changed.
\n\n
"
);
fflush
(
stdout
);
result
=
NULL
;
taos_free_result
(
pSql
);
return
;
}
...
...
@@ -294,6 +297,7 @@ void shellRunCommandOnServer(TAOS *con, char command[]) {
int
error_no
=
0
;
int
numOfRows
=
shellDumpResult
(
pSql
,
fname
,
&
error_no
,
printMode
);
if
(
numOfRows
<
0
)
{
result
=
NULL
;
taos_free_result
(
pSql
);
return
;
}
...
...
@@ -315,7 +319,8 @@ void shellRunCommandOnServer(TAOS *con, char command[]) {
if
(
fname
!=
NULL
)
{
wordfree
(
&
full_path
);
}
result
=
NULL
;
taos_free_result
(
pSql
);
}
...
...
@@ -419,8 +424,8 @@ static void dumpFieldToFile(FILE* fp, const char* val, TAOS_FIELD* field, int32_
}
}
static
int
dumpResultToFile
(
const
char
*
fname
,
TAOS_RES
*
result
)
{
TAOS_ROW
row
=
taos_fetch_row
(
result
);
static
int
dumpResultToFile
(
const
char
*
fname
,
TAOS_RES
*
tres
)
{
TAOS_ROW
row
=
taos_fetch_row
(
tres
);
if
(
row
==
NULL
)
{
return
0
;
}
...
...
@@ -441,9 +446,9 @@ static int dumpResultToFile(const char* fname, TAOS_RES* result) {
wordfree
(
&
full_path
);
int
num_fields
=
taos_num_fields
(
result
);
TAOS_FIELD
*
fields
=
taos_fetch_fields
(
result
);
int
precision
=
taos_result_precision
(
result
);
int
num_fields
=
taos_num_fields
(
tres
);
TAOS_FIELD
*
fields
=
taos_fetch_fields
(
tres
);
int
precision
=
taos_result_precision
(
tres
);
for
(
int
col
=
0
;
col
<
num_fields
;
col
++
)
{
if
(
col
>
0
)
{
...
...
@@ -455,7 +460,7 @@ static int dumpResultToFile(const char* fname, TAOS_RES* result) {
int
numOfRows
=
0
;
do
{
int32_t
*
length
=
taos_fetch_lengths
(
result
);
int32_t
*
length
=
taos_fetch_lengths
(
tres
);
for
(
int
i
=
0
;
i
<
num_fields
;
i
++
)
{
if
(
i
>
0
)
{
fputc
(
','
,
fp
);
...
...
@@ -465,10 +470,13 @@ static int dumpResultToFile(const char* fname, TAOS_RES* result) {
fputc
(
'\n'
,
fp
);
numOfRows
++
;
row
=
taos_fetch_row
(
result
);
row
=
taos_fetch_row
(
tres
);
}
while
(
row
!=
NULL
);
result
=
NULL
;
taos_free_result
(
tres
);
fclose
(
fp
);
return
numOfRows
;
}
...
...
@@ -769,8 +777,7 @@ void write_history() {
void
taos_error
(
TAOS_RES
*
tres
)
{
fprintf
(
stderr
,
"
\n
DB error: %s
\n
"
,
taos_errstr
(
tres
));
/* free local resouce: allocated memory/metric-meta refcnt */
result
=
NULL
;
taos_free_result
(
tres
);
}
...
...
@@ -845,9 +852,9 @@ void shellGetGrantInfo(void *con) {
char
sql
[]
=
"show grants"
;
result
=
taos_query
(
con
,
sql
);
TAOS_RES
*
tres
=
taos_query
(
con
,
sql
);
int
code
=
taos_errno
(
result
);
int
code
=
taos_errno
(
tres
);
if
(
code
!=
TSDB_CODE_SUCCESS
)
{
if
(
code
==
TSDB_CODE_COM_OPS_NOT_SUPPORT
)
{
fprintf
(
stdout
,
"Server is Community Edition, version is %s
\n\n
"
,
taos_get_server_info
(
con
));
...
...
@@ -857,18 +864,18 @@ void shellGetGrantInfo(void *con) {
return
;
}
int
num_fields
=
taos_field_count
(
result
);
int
num_fields
=
taos_field_count
(
tres
);
if
(
num_fields
==
0
)
{
fprintf
(
stderr
,
"
\n
Invalid grant information.
\n
"
);
exit
(
0
);
}
else
{
if
(
result
==
NULL
)
{
if
(
tres
==
NULL
)
{
fprintf
(
stderr
,
"
\n
Grant information is null.
\n
"
);
exit
(
0
);
}
TAOS_FIELD
*
fields
=
taos_fetch_fields
(
result
);
TAOS_ROW
row
=
taos_fetch_row
(
result
);
TAOS_FIELD
*
fields
=
taos_fetch_fields
(
tres
);
TAOS_ROW
row
=
taos_fetch_row
(
tres
);
if
(
row
==
NULL
)
{
fprintf
(
stderr
,
"
\n
Failed to get grant information from server. Abort.
\n
"
);
exit
(
0
);
...
...
@@ -888,8 +895,8 @@ void shellGetGrantInfo(void *con) {
fprintf
(
stdout
,
"Server is Enterprise %s Edition, version is %s and will expire at %s.
\n
"
,
serverVersion
,
taos_get_server_info
(
con
),
expiretime
);
}
taos_free_result
(
result
);
result
=
NULL
;
taos_free_result
(
tres
);
}
fprintf
(
stdout
,
"
\n
"
);
...
...
src/kit/shell/src/shellMain.c
浏览文件 @
f139f1a6
...
...
@@ -15,7 +15,6 @@
#include "os.h"
#include "shell.h"
#include "tsclient.h"
pthread_t
pid
;
...
...
@@ -23,14 +22,6 @@ pthread_t pid;
void
interruptHandler
(
int
signum
)
{
#ifdef LINUX
taos_stop_query
(
result
);
if
(
result
!=
NULL
)
{
/*
* we need to free result in async model, in order to avoid free
* results while the master thread is waiting for server response.
*/
tscQueueAsyncFreeResult
(
result
);
}
result
=
NULL
;
#else
printf
(
"
\n
Receive ctrl+c or other signal, quit shell.
\n
"
);
...
...
src/kit/taosdump/taosdump.c
浏览文件 @
f139f1a6
...
...
@@ -295,7 +295,6 @@ static error_t parse_opt(int key, char *arg, struct argp_state *state) {
static
struct
argp
argp
=
{
options
,
parse_opt
,
args_doc
,
doc
};
TAOS
*
taos
=
NULL
;
TAOS_RES
*
result
=
NULL
;
char
*
command
=
NULL
;
char
*
lcommand
=
NULL
;
char
*
buffer
=
NULL
;
...
...
@@ -465,10 +464,10 @@ int taosDumpOut(SDumpArguments *arguments) {
taosDumpCharset
(
fp
);
sprintf
(
command
,
"show databases"
);
result
=
taos_query
(
taos
,
command
);
TAOS_RES
*
result
=
taos_query
(
taos
,
command
);
int32_t
code
=
taos_errno
(
result
);
if
(
code
!=
0
)
{
fprintf
(
stderr
,
"failed to run command: %s, reason: %s
\n
"
,
command
,
taos_errstr
(
taos
));
fprintf
(
stderr
,
"failed to run command: %s, reason: %s
\n
"
,
command
,
taos_errstr
(
result
));
taos_free_result
(
result
);
goto
_exit_failure
;
}
...
...
@@ -615,7 +614,7 @@ int taosDumpDb(SDbInfo *dbInfo, SDumpArguments *arguments, FILE *fp) {
fprintf
(
fp
,
"USE %s
\n\n
"
,
dbInfo
->
name
);
sprintf
(
command
,
"show tables"
);
result
=
taos_query
(
taos
,
command
);
TAOS_RES
*
result
=
taos_query
(
taos
,
command
);
int32_t
code
=
taos_errno
(
result
);
if
(
code
!=
0
)
{
fprintf
(
stderr
,
"failed to run command %s, error: %s
\n
"
,
command
,
taos_errstr
(
result
));
...
...
@@ -719,7 +718,7 @@ void taosDumpCreateMTableClause(STableDef *tableDes, char *metric, int numOfCols
sprintf
(
command
,
"select %s from %s limit 1"
,
tableDes
->
cols
[
counter
].
field
,
tableDes
->
name
);
result
=
taos_query
(
taos
,
command
);
TAOS_RES
*
result
=
taos_query
(
taos
,
command
);
int32_t
code
=
taos_errno
(
result
);
if
(
code
!=
0
)
{
fprintf
(
stderr
,
"failed to run command %s, error: %s
\n
"
,
command
,
taos_errstr
(
result
));
...
...
@@ -797,7 +796,7 @@ int taosGetTableDes(char *table, STableDef *tableDes) {
sprintf
(
command
,
"describe %s"
,
table
);
result
=
taos_query
(
taos
,
command
);
TAOS_RES
*
result
=
taos_query
(
taos
,
command
);
int32_t
code
=
taos_errno
(
result
);
if
(
code
!=
0
)
{
fprintf
(
stderr
,
"failed to run command %s, error: %s
\n
"
,
command
,
taos_errstr
(
result
));
...
...
@@ -877,7 +876,7 @@ int32_t taosDumpMetric(char *metric, SDumpArguments *arguments, FILE *fp) {
tstrncpy
(
tableRecord
.
metric
,
metric
,
TSDB_TABLE_NAME_LEN
);
sprintf
(
command
,
"select tbname from %s"
,
metric
);
result
=
taos_query
(
taos
,
command
);
TAOS_RES
*
result
=
taos_query
(
taos
,
command
);
int32_t
code
=
taos_errno
(
result
);
if
(
code
!=
0
)
{
fprintf
(
stderr
,
"failed to run command %s, error: %s
\n
"
,
command
,
taos_errstr
(
result
));
...
...
@@ -930,7 +929,7 @@ int taosDumpTableData(FILE *fp, char *tbname, SDumpArguments *arguments) {
sprintf
(
command
,
"select * from %s where _c0 >= %"
PRId64
" and _c0 <= %"
PRId64
" order by _c0 asc"
,
tbname
,
arguments
->
start_time
,
arguments
->
end_time
);
result
=
taos_query
(
taos
,
command
);
TAOS_RES
*
result
=
taos_query
(
taos
,
command
);
int32_t
code
=
taos_errno
(
result
);
if
(
code
!=
0
)
{
fprintf
(
stderr
,
"failed to run command %s, reason: %s
\n
"
,
command
,
taos_errstr
(
result
));
...
...
@@ -1179,9 +1178,13 @@ int taosDumpIn(SDumpArguments *arguments) {
tcommand
=
command
;
}
taosReplaceCtrlChar
(
tcommand
);
if
(
taos_query
(
taos
,
tcommand
)
==
NULL
)
TAOS_RES
*
result
=
taos_query
(
taos
,
tcommand
);
if
(
taos_errno
(
result
)
!=
0
){
fprintf
(
stderr
,
"linenu: %"
PRId64
" failed to run command %s reason:%s
\n
continue...
\n
"
,
linenu
,
command
,
taos_errstr
(
taos
));
taos_errstr
(
result
));
taos_free_result
(
result
);
}
pstr
=
command
;
pstr
[
0
]
=
'\0'
;
...
...
@@ -1227,12 +1230,12 @@ int taosDumpIn(SDumpArguments *arguments) {
tcommand
=
command
;
}
taosReplaceCtrlChar
(
tcommand
);
result
=
taos_query
(
taos
,
tcommand
);
TAOS_RES
*
result
=
taos_query
(
taos
,
tcommand
);
int32_t
code
=
taos_errno
(
result
);
if
(
code
!=
0
)
{
fprintf
(
stderr
,
"linenu:%"
PRId64
" failed to run command %s reason: %s
\n
continue...
\n
"
,
linenu
,
command
,
taos_errstr
(
taos
));
taos_errstr
(
result
));
}
taos_free_result
(
result
);
}
...
...
src/query/inc/qextbuffer.h
浏览文件 @
f139f1a6
...
...
@@ -149,7 +149,7 @@ int16_t tExtMemBufferPut(tExtMemBuffer *pMemBuffer, void *data, int32_t numOfRow
* @param pMemBuffer
* @return
*/
bool
tExtMemBufferFlush
(
tExtMemBuffer
*
pMemBuffer
);
int32_t
tExtMemBufferFlush
(
tExtMemBuffer
*
pMemBuffer
);
/**
*
...
...
src/query/src/qextbuffer.c
浏览文件 @
f139f1a6
...
...
@@ -245,30 +245,29 @@ static void tExtMemBufferClearFlushoutInfo(tExtMemBuffer *pMemBuffer) {
memset
(
pFileMeta
->
flushoutData
.
pFlushoutInfo
,
0
,
sizeof
(
tFlushoutInfo
)
*
pFileMeta
->
flushoutData
.
nAllocSize
);
}
bool
tExtMemBufferFlush
(
tExtMemBuffer
*
pMemBuffer
)
{
int32_t
tExtMemBufferFlush
(
tExtMemBuffer
*
pMemBuffer
)
{
int32_t
ret
=
0
;
if
(
pMemBuffer
->
numOfTotalElems
==
0
)
{
return
true
;
return
ret
;
}
if
(
pMemBuffer
->
file
==
NULL
)
{
if
((
pMemBuffer
->
file
=
fopen
(
pMemBuffer
->
path
,
"wb+"
))
==
NULL
)
{
return
false
;
ret
=
TAOS_SYSTEM_ERROR
(
errno
);
return
ret
;
}
}
/* all data has been flushed to disk, ignore flush operation */
if
(
pMemBuffer
->
numOfElemsInBuffer
==
0
)
{
return
true
;
return
ret
;
}
bool
ret
=
true
;
tFilePagesItem
*
first
=
pMemBuffer
->
pHead
;
while
(
first
!=
NULL
)
{
size_t
retVal
=
fwrite
((
char
*
)
&
(
first
->
item
),
pMemBuffer
->
pageSize
,
1
,
pMemBuffer
->
file
);
if
(
retVal
<=
0
)
{
// failed to write to buffer, may be not enough space
ret
=
false
;
ret
=
TAOS_SYSTEM_ERROR
(
errno
)
;
}
pMemBuffer
->
fileMeta
.
numOfElemsInFile
+=
first
->
item
.
num
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录