Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
taosdata
TDengine
提交
55724157
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看板
提交
55724157
编写于
6月 15, 2023
作者:
H
Haojun Liao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
refactor: remove one function.
上级
13028744
变更
12
隐藏空白更改
内联
并排
Showing
12 changed file
with
25 addition
and
30 deletion
+25
-30
include/common/tdatablock.h
include/common/tdatablock.h
+0
-1
source/common/src/tdatablock.c
source/common/src/tdatablock.c
+0
-4
source/dnode/mnode/impl/src/mndIndex.c
source/dnode/mnode/impl/src/mndIndex.c
+7
-7
source/dnode/mnode/impl/src/mndSma.c
source/dnode/mnode/impl/src/mndSma.c
+2
-2
source/dnode/mnode/impl/src/mndVgroup.c
source/dnode/mnode/impl/src/mndVgroup.c
+1
-1
source/libs/command/src/command.c
source/libs/command/src/command.c
+1
-1
source/libs/executor/src/groupoperator.c
source/libs/executor/src/groupoperator.c
+1
-1
source/libs/executor/src/sysscanoperator.c
source/libs/executor/src/sysscanoperator.c
+6
-6
source/libs/executor/src/timesliceoperator.c
source/libs/executor/src/timesliceoperator.c
+1
-1
source/libs/function/src/builtinsimpl.c
source/libs/function/src/builtinsimpl.c
+1
-1
source/libs/geometry/src/geomFunc.c
source/libs/geometry/src/geomFunc.c
+4
-4
source/libs/geometry/test/geomFuncTestUtil.cpp
source/libs/geometry/test/geomFuncTestUtil.cpp
+1
-1
未找到文件。
include/common/tdatablock.h
浏览文件 @
55724157
...
...
@@ -177,7 +177,6 @@ static FORCE_INLINE void colDataSetDouble(SColumnInfoData* pColumnInfoData, uint
int32_t
getJsonValueLen
(
const
char
*
data
);
int32_t
colDataSetVal
(
SColumnInfoData
*
pColumnInfoData
,
uint32_t
rowIndex
,
const
char
*
pData
,
bool
isNull
);
int32_t
colDataAppend
(
SColumnInfoData
*
pColumnInfoData
,
uint32_t
rowIndex
,
const
char
*
pData
,
bool
isNull
);
int32_t
colDataReassignVal
(
SColumnInfoData
*
pColumnInfoData
,
uint32_t
dstRowIdx
,
uint32_t
srcRowIdx
,
const
char
*
pData
);
int32_t
colDataSetNItems
(
SColumnInfoData
*
pColumnInfoData
,
uint32_t
rowIndex
,
const
char
*
pData
,
uint32_t
numOfRows
,
bool
trimValue
);
int32_t
colDataMergeCol
(
SColumnInfoData
*
pColumnInfoData
,
int32_t
numOfRow1
,
int32_t
*
capacity
,
...
...
source/common/src/tdatablock.c
浏览文件 @
55724157
...
...
@@ -74,10 +74,6 @@ int32_t getJsonValueLen(const char* data) {
return
dataLen
;
}
int32_t
colDataAppend
(
SColumnInfoData
*
pColumnInfoData
,
uint32_t
rowIndex
,
const
char
*
pData
,
bool
isNull
)
{
return
colDataSetVal
(
pColumnInfoData
,
rowIndex
,
pData
,
isNull
);
}
int32_t
colDataSetVal
(
SColumnInfoData
*
pColumnInfoData
,
uint32_t
rowIndex
,
const
char
*
pData
,
bool
isNull
)
{
if
(
isNull
)
{
// There is a placehold for each NULL value of binary or nchar type.
...
...
source/dnode/mnode/impl/src/mndIndex.c
浏览文件 @
55724157
...
...
@@ -542,32 +542,32 @@ int32_t mndRetrieveTagIdx(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *pBlock, i
STR_TO_VARSTR
(
n3
,
(
char
*
)
tNameGetTableName
(
&
stbName
));
SColumnInfoData
*
pColInfo
=
taosArrayGet
(
pBlock
->
pDataBlock
,
cols
++
);
colData
Append
(
pColInfo
,
numOfRows
,
(
const
char
*
)
n1
,
false
);
colData
SetVal
(
pColInfo
,
numOfRows
,
(
const
char
*
)
n1
,
false
);
pColInfo
=
taosArrayGet
(
pBlock
->
pDataBlock
,
cols
++
);
colData
Append
(
pColInfo
,
numOfRows
,
(
const
char
*
)
n2
,
false
);
colData
SetVal
(
pColInfo
,
numOfRows
,
(
const
char
*
)
n2
,
false
);
pColInfo
=
taosArrayGet
(
pBlock
->
pDataBlock
,
cols
++
);
colData
Append
(
pColInfo
,
numOfRows
,
(
const
char
*
)
n3
,
false
);
colData
SetVal
(
pColInfo
,
numOfRows
,
(
const
char
*
)
n3
,
false
);
pColInfo
=
taosArrayGet
(
pBlock
->
pDataBlock
,
cols
++
);
colData
Append
(
pColInfo
,
numOfRows
,
(
const
char
*
)
&
invalid
,
false
);
colData
SetVal
(
pColInfo
,
numOfRows
,
(
const
char
*
)
&
invalid
,
false
);
pColInfo
=
taosArrayGet
(
pBlock
->
pDataBlock
,
cols
++
);
colData
Append
(
pColInfo
,
numOfRows
,
(
const
char
*
)
&
pIdx
->
createdTime
,
false
);
colData
SetVal
(
pColInfo
,
numOfRows
,
(
const
char
*
)
&
pIdx
->
createdTime
,
false
);
char
col
[
TSDB_TABLE_FNAME_LEN
+
VARSTR_HEADER_SIZE
]
=
{
0
};
STR_TO_VARSTR
(
col
,
(
char
*
)
pIdx
->
colName
);
pColInfo
=
taosArrayGet
(
pBlock
->
pDataBlock
,
cols
++
);
colData
Append
(
pColInfo
,
numOfRows
,
(
const
char
*
)
col
,
false
);
colData
SetVal
(
pColInfo
,
numOfRows
,
(
const
char
*
)
col
,
false
);
pColInfo
=
taosArrayGet
(
pBlock
->
pDataBlock
,
cols
++
);
char
tag
[
TSDB_TABLE_FNAME_LEN
+
VARSTR_HEADER_SIZE
]
=
{
0
};
STR_TO_VARSTR
(
tag
,
(
char
*
)
"tag_index"
);
colData
Append
(
pColInfo
,
numOfRows
,
(
const
char
*
)
tag
,
false
);
colData
SetVal
(
pColInfo
,
numOfRows
,
(
const
char
*
)
tag
,
false
);
numOfRows
++
;
sdbRelease
(
pSdb
,
pIdx
);
...
...
source/dnode/mnode/impl/src/mndSma.c
浏览文件 @
55724157
...
...
@@ -1278,13 +1278,13 @@ static int32_t mndRetrieveSma(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *pBloc
STR_TO_VARSTR
(
col
,
(
char
*
)
""
);
pColInfo
=
taosArrayGet
(
pBlock
->
pDataBlock
,
cols
++
);
colData
Append
(
pColInfo
,
numOfRows
,
(
const
char
*
)
col
,
false
);
colData
SetVal
(
pColInfo
,
numOfRows
,
(
const
char
*
)
col
,
false
);
pColInfo
=
taosArrayGet
(
pBlock
->
pDataBlock
,
cols
++
);
char
tag
[
TSDB_TABLE_FNAME_LEN
+
VARSTR_HEADER_SIZE
]
=
{
0
};
STR_TO_VARSTR
(
tag
,
(
char
*
)
"sma_index"
);
colData
Append
(
pColInfo
,
numOfRows
,
(
const
char
*
)
tag
,
false
);
colData
SetVal
(
pColInfo
,
numOfRows
,
(
const
char
*
)
tag
,
false
);
numOfRows
++
;
sdbRelease
(
pSdb
,
pSma
);
...
...
source/dnode/mnode/impl/src/mndVgroup.c
浏览文件 @
55724157
...
...
@@ -874,7 +874,7 @@ static int32_t mndRetrieveVgroups(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *p
// if (pDb == NULL || pDb->compactStartTime <= 0) {
// colDataSetNULL(pColInfo, numOfRows);
// } else {
// colData
Append
(pColInfo, numOfRows, (const char *)&pDb->compactStartTime, false);
// colData
SetVal
(pColInfo, numOfRows, (const char *)&pDb->compactStartTime, false);
// }
numOfRows
++
;
...
...
source/libs/command/src/command.c
浏览文件 @
55724157
...
...
@@ -392,7 +392,7 @@ static int32_t setAliveResultIntoDataBlock(int64_t* pConnId, SSDataBlock* pBlock
int32_t
status
=
0
;
int32_t
code
=
getAliveStatusFromApi
(
pConnId
,
dbName
,
&
status
);
if
(
code
==
TSDB_CODE_SUCCESS
)
{
colData
Append
(
pCol1
,
0
,
(
const
char
*
)
&
status
,
false
);
colData
SetVal
(
pCol1
,
0
,
(
const
char
*
)
&
status
,
false
);
}
return
code
;
}
...
...
source/libs/executor/src/groupoperator.c
浏览文件 @
55724157
...
...
@@ -1033,7 +1033,7 @@ void appendCreateTableRow(void* pState, SExprSupp* pTableSup, SExprSupp* pTagSup
}
void
*
pGpIdCol
=
taosArrayGet
(
pDestBlock
->
pDataBlock
,
UD_GROUPID_COLUMN_INDEX
);
colData
Append
(
pGpIdCol
,
pDestBlock
->
info
.
rows
,
(
const
char
*
)
&
groupId
,
false
);
colData
SetVal
(
pGpIdCol
,
pDestBlock
->
info
.
rows
,
(
const
char
*
)
&
groupId
,
false
);
pDestBlock
->
info
.
rows
++
;
blockDataDestroy
(
pTmpBlock
);
}
else
{
...
...
source/libs/executor/src/sysscanoperator.c
浏览文件 @
55724157
...
...
@@ -966,20 +966,20 @@ static int32_t sysTableUserColsFillOneTableCols(const SSysTableScanInfo* pInfo,
// table name
pColInfoData
=
taosArrayGet
(
dataBlock
->
pDataBlock
,
0
);
colData
Append
(
pColInfoData
,
numOfRows
,
tName
,
false
);
colData
SetVal
(
pColInfoData
,
numOfRows
,
tName
,
false
);
// database name
pColInfoData
=
taosArrayGet
(
dataBlock
->
pDataBlock
,
1
);
colData
Append
(
pColInfoData
,
numOfRows
,
dbname
,
false
);
colData
SetVal
(
pColInfoData
,
numOfRows
,
dbname
,
false
);
pColInfoData
=
taosArrayGet
(
dataBlock
->
pDataBlock
,
2
);
colData
Append
(
pColInfoData
,
numOfRows
,
tableType
,
false
);
colData
SetVal
(
pColInfoData
,
numOfRows
,
tableType
,
false
);
// col name
char
colName
[
TSDB_COL_NAME_LEN
+
VARSTR_HEADER_SIZE
]
=
{
0
};
STR_TO_VARSTR
(
colName
,
schemaRow
->
pSchema
[
i
].
name
);
pColInfoData
=
taosArrayGet
(
dataBlock
->
pDataBlock
,
3
);
colData
Append
(
pColInfoData
,
numOfRows
,
colName
,
false
);
colData
SetVal
(
pColInfoData
,
numOfRows
,
colName
,
false
);
// col type
int8_t
colType
=
schemaRow
->
pSchema
[
i
].
type
;
...
...
@@ -994,10 +994,10 @@ static int32_t sysTableUserColsFillOneTableCols(const SSysTableScanInfo* pInfo,
(
int32_t
)((
schemaRow
->
pSchema
[
i
].
bytes
-
VARSTR_HEADER_SIZE
)
/
TSDB_NCHAR_SIZE
));
}
varDataSetLen
(
colTypeStr
,
colTypeLen
);
colData
Append
(
pColInfoData
,
numOfRows
,
(
char
*
)
colTypeStr
,
false
);
colData
SetVal
(
pColInfoData
,
numOfRows
,
(
char
*
)
colTypeStr
,
false
);
pColInfoData
=
taosArrayGet
(
dataBlock
->
pDataBlock
,
5
);
colData
Append
(
pColInfoData
,
numOfRows
,
(
const
char
*
)
&
schemaRow
->
pSchema
[
i
].
bytes
,
false
);
colData
SetVal
(
pColInfoData
,
numOfRows
,
(
const
char
*
)
&
schemaRow
->
pSchema
[
i
].
bytes
,
false
);
for
(
int32_t
j
=
6
;
j
<=
8
;
++
j
)
{
pColInfoData
=
taosArrayGet
(
dataBlock
->
pDataBlock
,
j
);
...
...
source/libs/executor/src/timesliceoperator.c
浏览文件 @
55724157
...
...
@@ -270,7 +270,7 @@ static bool genInterpolationResult(STimeSliceOperatorInfo* pSliceInfo, SExprSupp
continue
;
}
else
if
(
isIsfilledPseudoColumn
(
pExprInfo
))
{
bool
isFilled
=
true
;
colData
Append
(
pDst
,
pResBlock
->
info
.
rows
,
(
char
*
)
&
isFilled
,
false
);
colData
SetVal
(
pDst
,
pResBlock
->
info
.
rows
,
(
char
*
)
&
isFilled
,
false
);
continue
;
}
else
if
(
!
isInterpFunc
(
pExprInfo
))
{
if
(
isGroupKeyFunc
(
pExprInfo
))
{
...
...
source/libs/function/src/builtinsimpl.c
浏览文件 @
55724157
...
...
@@ -1712,7 +1712,7 @@ int32_t percentileFinalize(SqlFunctionCtx* pCtx, SSDataBlock* pBlock) {
SColumnInfoData
*
pCol
=
taosArrayGet
(
pBlock
->
pDataBlock
,
slotId
);
varDataSetLen
(
buf
,
len
);
colData
Append
(
pCol
,
pBlock
->
info
.
rows
,
buf
,
false
);
colData
SetVal
(
pCol
,
pBlock
->
info
.
rows
,
buf
,
false
);
tMemBucketDestroy
(
pMemBucket
);
return
pResInfo
->
numOfRes
;
...
...
source/libs/geometry/src/geomFunc.c
浏览文件 @
55724157
...
...
@@ -145,7 +145,7 @@ int32_t executeMakePointFunc(SColumnInfoData *pInputData[], int32_t iLeft, int32
goto
_exit
;
}
colData
Append
(
pOutputData
,
TMAX
(
iLeft
,
iRight
),
output
,
(
output
==
NULL
));
colData
SetVal
(
pOutputData
,
TMAX
(
iLeft
,
iRight
),
output
,
(
output
==
NULL
));
_exit:
if
(
output
)
{
...
...
@@ -165,7 +165,7 @@ int32_t executeGeomFromTextFunc(SColumnInfoData *pInputData, int32_t i, SColumnI
goto
_exit
;
}
colData
Append
(
pOutputData
,
i
,
output
,
(
output
==
NULL
));
colData
SetVal
(
pOutputData
,
i
,
output
,
(
output
==
NULL
));
_exit:
if
(
output
)
{
...
...
@@ -185,7 +185,7 @@ int32_t executeAsTextFunc(SColumnInfoData *pInputData, int32_t i, SColumnInfoDat
goto
_exit
;
}
colData
Append
(
pOutputData
,
i
,
output
,
(
output
==
NULL
));
colData
SetVal
(
pOutputData
,
i
,
output
,
(
output
==
NULL
));
_exit:
if
(
output
)
{
...
...
@@ -213,7 +213,7 @@ int32_t executeRelationFunc(const GEOSGeometry *geom1, const GEOSPreparedGeometr
}
}
colData
Append
(
pOutputData
,
i
,
&
res
,
(
res
==-
1
));
colData
SetVal
(
pOutputData
,
i
,
&
res
,
(
res
==-
1
));
return
code
;
}
...
...
source/libs/geometry/test/geomFuncTestUtil.cpp
浏览文件 @
55724157
...
...
@@ -84,7 +84,7 @@ void setScalarParam(SScalarParam *sclParam, int32_t type, void *valueArray, TDRo
}
else
{
const
char
*
val
=
(
const
char
*
)
valueArray
+
(
i
*
bytes
);
colData
Append
(
sclParam
->
columnData
,
i
,
val
,
false
);
colData
SetVal
(
sclParam
->
columnData
,
i
,
val
,
false
);
}
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录