Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
codyshao
TDengine
提交
285e2c56
T
TDengine
项目概览
codyshao
/
TDengine
与 Fork 源项目一致
Fork自
taosdata / TDengine
通知
2
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看板
体验新版 GitCode,发现更多精彩内容 >>
提交
285e2c56
编写于
7月 10, 2020
作者:
S
Shengliang Guan
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'origin/develop' into feature/vnode
上级
d75e835a
5ae96439
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
36 addition
and
10 deletion
+36
-10
src/client/src/tscLocalMerge.c
src/client/src/tscLocalMerge.c
+7
-0
src/client/src/tscStream.c
src/client/src/tscStream.c
+3
-0
src/client/src/tscSubquery.c
src/client/src/tscSubquery.c
+2
-3
src/client/src/tscUtil.c
src/client/src/tscUtil.c
+0
-1
src/mnode/src/mnodeDb.c
src/mnode/src/mnodeDb.c
+6
-1
src/plugins/http/src/httpSql.c
src/plugins/http/src/httpSql.c
+4
-3
src/tsdb/src/tsdbMemTable.c
src/tsdb/src/tsdbMemTable.c
+6
-2
tests/pytest/fulltest.sh
tests/pytest/fulltest.sh
+4
-0
tests/pytest/regressiontest.sh
tests/pytest/regressiontest.sh
+4
-0
未找到文件。
src/client/src/tscLocalMerge.c
浏览文件 @
285e2c56
...
...
@@ -274,6 +274,10 @@ void tscCreateLocalReducer(tExtMemBuffer **pMemBuffer, int32_t numOfBuffer, tOrd
pReducer
->
numOfBuffer
=
idx
;
SCompareParam
*
param
=
malloc
(
sizeof
(
SCompareParam
));
if
(
param
==
NULL
)
{
tfree
(
pReducer
);
return
;
}
param
->
pLocalData
=
pReducer
->
pLocalDataSrc
;
param
->
pDesc
=
pReducer
->
pDesc
;
param
->
num
=
pReducer
->
pLocalDataSrc
[
0
]
->
pMemBuffer
->
numOfElemsPerPage
;
...
...
@@ -284,6 +288,7 @@ void tscCreateLocalReducer(tExtMemBuffer **pMemBuffer, int32_t numOfBuffer, tOrd
pRes
->
code
=
tLoserTreeCreate
(
&
pReducer
->
pLoserTree
,
pReducer
->
numOfBuffer
,
param
,
treeComparator
);
if
(
pReducer
->
pLoserTree
==
NULL
||
pRes
->
code
!=
0
)
{
tfree
(
param
);
tfree
(
pReducer
);
return
;
}
...
...
@@ -332,6 +337,8 @@ void tscCreateLocalReducer(tExtMemBuffer **pMemBuffer, int32_t numOfBuffer, tOrd
tfree
(
pReducer
->
pResultBuf
);
tfree
(
pReducer
->
pFinalRes
);
tfree
(
pReducer
->
prevRowOfInput
);
tfree
(
pReducer
->
pLoserTree
);
tfree
(
param
);
tfree
(
pReducer
);
pRes
->
code
=
TSDB_CODE_TSC_OUT_OF_MEMORY
;
return
;
...
...
src/client/src/tscStream.c
浏览文件 @
285e2c56
...
...
@@ -255,6 +255,9 @@ static void tscProcessStreamRetrieveResult(void *param, TAOS_RES *res, int numOf
// release the metric/meter meta information reference, so data in cache can be updated
taosCacheRelease
(
tscCacheHandle
,
(
void
**
)
&
(
pTableMetaInfo
->
pTableMeta
),
false
);
tscFreeSqlResult
(
pSql
);
tfree
(
pSql
->
pSubs
);
pSql
->
numOfSubs
=
0
;
tfree
(
pTableMetaInfo
->
vgroupList
);
tscSetNextLaunchTimer
(
pStream
,
pSql
);
}
...
...
src/client/src/tscSubquery.c
浏览文件 @
285e2c56
...
...
@@ -1447,9 +1447,7 @@ int32_t tscHandleMasterSTableQuery(SSqlObj *pSql) {
static
void
tscFreeSubSqlObj
(
SRetrieveSupport
*
trsupport
,
SSqlObj
*
pSql
)
{
tscDebug
(
"%p start to free subquery result"
,
pSql
);
if
(
pSql
->
res
.
code
==
TSDB_CODE_SUCCESS
)
{
taos_free_result
(
pSql
);
}
taos_free_result
(
pSql
);
tfree
(
trsupport
->
localBuffer
);
...
...
@@ -1780,6 +1778,7 @@ static SSqlObj *tscCreateSqlObjForSubquery(SSqlObj *pSql, SRetrieveSupport *trsu
pSql
->
pSubs
[
trsupport
->
subqueryIndex
]
=
pNew
;
}
printf
(
"------------alloc:%p
\n
"
,
pNew
);
return
pNew
;
}
...
...
src/client/src/tscUtil.c
浏览文件 @
285e2c56
...
...
@@ -1822,7 +1822,6 @@ SSqlObj* createSubqueryObj(SSqlObj* pSql, int16_t tableIndex, void (*fp)(), void
STableMeta
*
pPrevTableMeta
=
taosCacheTransfer
(
tscCacheHandle
,
(
void
**
)
&
pPrevInfo
->
pTableMeta
);
SVgroupsInfo
*
pVgroupsInfo
=
pPrevInfo
->
vgroupList
;
pPrevInfo
->
vgroupList
=
NULL
;
pFinalInfo
=
tscAddTableMetaInfo
(
pNewQueryInfo
,
name
,
pPrevTableMeta
,
pVgroupsInfo
,
pTableMetaInfo
->
tagColList
);
}
...
...
src/mnode/src/mnodeDb.c
浏览文件 @
285e2c56
...
...
@@ -188,9 +188,14 @@ void mnodeDecDbRef(SDbObj *pDb) {
SDbObj
*
mnodeGetDbByTableId
(
char
*
tableId
)
{
char
db
[
TSDB_TABLE_ID_LEN
],
*
pos
;
// tableId format should be : acct.db.table
pos
=
strstr
(
tableId
,
TS_PATH_DELIMITER
);
assert
(
NULL
!=
pos
);
pos
=
strstr
(
pos
+
1
,
TS_PATH_DELIMITER
);
assert
(
NULL
!=
pos
);
memset
(
db
,
0
,
sizeof
(
db
));
strncpy
(
db
,
tableId
,
pos
-
tableId
);
...
...
src/plugins/http/src/httpSql.c
浏览文件 @
285e2c56
...
...
@@ -233,10 +233,11 @@ void httpProcessSingleSqlRetrieveCallBack(void *param, TAOS_RES *result, int num
}
}
void
httpProcessSingleSqlCallBack
(
void
*
param
,
TAOS_RES
*
result
,
int
c
ode
)
{
void
httpProcessSingleSqlCallBack
(
void
*
param
,
TAOS_RES
*
result
,
int
unUsedC
ode
)
{
HttpContext
*
pContext
=
(
HttpContext
*
)
param
;
if
(
pContext
==
NULL
)
return
;
int32_t
code
=
taos_errno
(
result
);
HttpEncodeMethod
*
encode
=
pContext
->
encodeMethod
;
if
(
code
==
TSDB_CODE_TSC_ACTION_IN_PROGRESS
)
{
...
...
@@ -260,8 +261,8 @@ void httpProcessSingleSqlCallBack(void *param, TAOS_RES *result, int code) {
return
;
}
int
num_fields
=
taos_field_count
(
result
);
if
(
num_fields
==
0
)
{
bool
isUpdate
=
tscIsUpdateQuery
(
result
);
if
(
isUpdate
)
{
// not select or show commands
int
affectRows
=
taos_affected_rows
(
result
);
...
...
src/tsdb/src/tsdbMemTable.c
浏览文件 @
285e2c56
...
...
@@ -119,7 +119,8 @@ int tsdbInsertRowToMem(STsdbRepo *pRepo, SDataRow row, STable *pTable) {
int
tsdbRefMemTable
(
STsdbRepo
*
pRepo
,
SMemTable
*
pMemTable
)
{
if
(
pMemTable
==
NULL
)
return
0
;
T_REF_INC
(
pMemTable
);
int
ref
=
T_REF_INC
(
pMemTable
);
tsdbDebug
(
"vgId:%d ref memtable %p ref %d"
,
REPO_ID
(
pRepo
),
pMemTable
,
ref
);
return
0
;
}
...
...
@@ -127,7 +128,9 @@ int tsdbRefMemTable(STsdbRepo *pRepo, SMemTable *pMemTable) {
int
tsdbUnRefMemTable
(
STsdbRepo
*
pRepo
,
SMemTable
*
pMemTable
)
{
if
(
pMemTable
==
NULL
)
return
0
;
if
(
T_REF_DEC
(
pMemTable
)
==
0
)
{
int
ref
=
T_REF_DEC
(
pMemTable
);
tsdbDebug
(
"vgId:%d unref memtable %p ref %d"
,
REPO_ID
(
pRepo
),
pMemTable
,
ref
);
if
(
ref
==
0
)
{
STsdbCfg
*
pCfg
=
&
pRepo
->
config
;
STsdbBufPool
*
pBufPool
=
pRepo
->
pPool
;
...
...
@@ -167,6 +170,7 @@ int tsdbTakeMemSnapshot(STsdbRepo *pRepo, SMemTable **pMem, SMemTable **pIMem) {
tsdbRefMemTable
(
pRepo
,
*
pIMem
);
if
(
tsdbUnlockRepo
(
pRepo
)
<
0
)
return
-
1
;
tsdbDebug
(
"vgId:%d take memory snapshot, pMem %p pIMem %p"
,
REPO_ID
(
pRepo
),
*
pMem
,
*
pIMem
);
return
0
;
}
...
...
tests/pytest/fulltest.sh
浏览文件 @
285e2c56
...
...
@@ -156,3 +156,7 @@ python3 ./test.py -f alter/alter_table_crash.py
# client
python3 ./test.py
-f
client/client.py
# Misc
python3 testCompress.py
python3 testNoCompress.py
tests/pytest/regressiontest.sh
浏览文件 @
285e2c56
...
...
@@ -150,3 +150,7 @@ python3 ./test.py -f alter/alter_table_crash.py
# client
python3 ./test.py
-f
client/client.py
# Misc
python3 testCompress.py
python3 testNoCompress.py
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录