other: merge 3.0

61634070 · Haojun Liao · 307b7e0a · 61634070 · 61634070
展开全部隐藏空白更改
内联并排

Showing with 380 addition and 30 deletion

source/dnode/vnode/inc/vnode.h source/dnode/vnode/inc/vnode.h +0 -1

source/libs/executor/src/scanoperator.c source/libs/executor/src/scanoperator.c +380 -29

未找到文件。
--- a/source/dnode/vnode/inc/vnode.h
+++ b/source/dnode/vnode/inc/vnode.h
@@ -165,7 +165,6 @@ SArray  *tsdbRetrieveDataBlock(STsdbReader *pTsdbReadHandle, SArray *pColumnIdLi
 int32_t  tsdbReaderReset(STsdbReader *pReader, SQueryTableDataCond *pCond);
 int32_t  tsdbGetFileBlocksDistInfo(STsdbReader *pReader, STableBlockDistInfo *pTableBlockInfo);
 int64_t  tsdbGetNumOfRowsInMemTable(STsdbReader *pHandle);
-bool     tsdbIsAscendingOrder(STsdbReader *pReader);
 void    *tsdbGetIdx(SMeta *pMeta);
 void    *tsdbGetIvtIdx(SMeta *pMeta);
 uint64_t getReaderMaxVersion(STsdbReader *pReader);

--- a/source/libs/executor/src/scanoperator.c
+++ b/source/libs/executor/src/scanoperator.c