Merge pull request #17886 from taosdata/feature/3_liaohj
fix(query): set the last key of each tablescan info
This commit is contained in:
Shengliang Guan
GitHub
commit
8ce2e12423
|
|
@ -225,13 +225,13 @@ typedef struct SVarColAttr {
|
||||||
// pBlockAgg->numOfNull == info.rows, all data are null
|
// pBlockAgg->numOfNull == info.rows, all data are null
|
||||||
// pBlockAgg->numOfNull == 0, no data are null.
|
// pBlockAgg->numOfNull == 0, no data are null.
|
||||||
typedef struct SColumnInfoData {
|
typedef struct SColumnInfoData {
|
||||||
SColumnInfo info; // column info
|
char* pData; // the corresponding block data in memory
|
||||||
bool hasNull; // if current column data has null value.
|
|
||||||
char* pData; // the corresponding block data in memory
|
|
||||||
union {
|
union {
|
||||||
char* nullbitmap; // bitmap, one bit for each item in the list
|
char* nullbitmap; // bitmap, one bit for each item in the list
|
||||||
SVarColAttr varmeta;
|
SVarColAttr varmeta;
|
||||||
};
|
};
|
||||||
|
SColumnInfo info; // column info
|
||||||
|
bool hasNull; // if current column data has null value.
|
||||||
} SColumnInfoData;
|
} SColumnInfoData;
|
||||||
|
|
||||||
typedef struct SQueryTableDataCond {
|
typedef struct SQueryTableDataCond {
|
||||||
|
|
|
||||||
|
|
@ -112,7 +112,7 @@ void createNewTable(TAOS* pConn, int32_t index) {
|
||||||
}
|
}
|
||||||
taos_free_result(pRes);
|
taos_free_result(pRes);
|
||||||
|
|
||||||
for(int32_t i = 0; i < 10000; i += 20) {
|
for(int32_t i = 0; i < 20; i += 20) {
|
||||||
char sql[1024] = {0};
|
char sql[1024] = {0};
|
||||||
sprintf(sql,
|
sprintf(sql,
|
||||||
"insert into tu%d values(now+%da, %d)(now+%da, %d)(now+%da, %d)(now+%da, %d)"
|
"insert into tu%d values(now+%da, %d)(now+%da, %d)(now+%da, %d)(now+%da, %d)"
|
||||||
|
|
@ -692,6 +692,7 @@ TEST(testCase, insert_test) {
|
||||||
taos_free_result(pRes);
|
taos_free_result(pRes);
|
||||||
taos_close(pConn);
|
taos_close(pConn);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
TEST(testCase, projection_query_tables) {
|
TEST(testCase, projection_query_tables) {
|
||||||
TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0);
|
TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0);
|
||||||
|
|
@ -703,7 +704,7 @@ TEST(testCase, projection_query_tables) {
|
||||||
// }
|
// }
|
||||||
// taos_free_result(pRes);
|
// taos_free_result(pRes);
|
||||||
|
|
||||||
TAOS_RES* pRes = taos_query(pConn, "use benchmarkcpu");
|
TAOS_RES* pRes = taos_query(pConn, "use abc2");
|
||||||
taos_free_result(pRes);
|
taos_free_result(pRes);
|
||||||
|
|
||||||
pRes = taos_query(pConn, "create stable st1 (ts timestamp, k int) tags(a int)");
|
pRes = taos_query(pConn, "create stable st1 (ts timestamp, k int) tags(a int)");
|
||||||
|
|
@ -725,7 +726,7 @@ TEST(testCase, projection_query_tables) {
|
||||||
}
|
}
|
||||||
taos_free_result(pRes);
|
taos_free_result(pRes);
|
||||||
|
|
||||||
for (int32_t i = 0; i < 2; ++i) {
|
for (int32_t i = 0; i < 200000; ++i) {
|
||||||
printf("create table :%d\n", i);
|
printf("create table :%d\n", i);
|
||||||
createNewTable(pConn, i);
|
createNewTable(pConn, i);
|
||||||
}
|
}
|
||||||
|
|
@ -750,7 +751,9 @@ TEST(testCase, projection_query_tables) {
|
||||||
taos_free_result(pRes);
|
taos_free_result(pRes);
|
||||||
taos_close(pConn);
|
taos_close(pConn);
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
|
#if 0
|
||||||
|
|
||||||
TEST(testCase, tsbs_perf_test) {
|
TEST(testCase, tsbs_perf_test) {
|
||||||
TdThread qid[20] = {0};
|
TdThread qid[20] = {0};
|
||||||
|
|
@ -761,7 +764,7 @@ TEST(testCase, tsbs_perf_test) {
|
||||||
getchar();
|
getchar();
|
||||||
}
|
}
|
||||||
|
|
||||||
#if 0
|
|
||||||
TEST(testCase, projection_query_stables) {
|
TEST(testCase, projection_query_stables) {
|
||||||
TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0);
|
TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0);
|
||||||
ASSERT_NE(pConn, nullptr);
|
ASSERT_NE(pConn, nullptr);
|
||||||
|
|
|
||||||
|
|
@ -185,11 +185,11 @@ static int32_t doMergeRowsInLastBlock(SLastBlockReader* pLastBlockReader, STabl
|
||||||
SRowMerger* pMerger, SVersionRange* pVerRange);
|
SRowMerger* pMerger, SVersionRange* pVerRange);
|
||||||
static int32_t doMergeRowsInBuf(SIterInfo* pIter, uint64_t uid, int64_t ts, SArray* pDelList, SRowMerger* pMerger,
|
static int32_t doMergeRowsInBuf(SIterInfo* pIter, uint64_t uid, int64_t ts, SArray* pDelList, SRowMerger* pMerger,
|
||||||
STsdbReader* pReader);
|
STsdbReader* pReader);
|
||||||
static int32_t doAppendRowFromTSRow(SSDataBlock* pBlock, STsdbReader* pReader, STSRow* pTSRow, uint64_t uid);
|
static int32_t doAppendRowFromTSRow(SSDataBlock* pBlock, STsdbReader* pReader, STSRow* pTSRow, STableBlockScanInfo* pInfo);
|
||||||
static int32_t doAppendRowFromFileBlock(SSDataBlock* pResBlock, STsdbReader* pReader, SBlockData* pBlockData,
|
static int32_t doAppendRowFromFileBlock(SSDataBlock* pResBlock, STsdbReader* pReader, SBlockData* pBlockData,
|
||||||
int32_t rowIndex);
|
int32_t rowIndex);
|
||||||
static void setComposedBlockFlag(STsdbReader* pReader, bool composed);
|
static void setComposedBlockFlag(STsdbReader* pReader, bool composed);
|
||||||
static bool hasBeenDropped(const SArray* pDelList, int32_t* index, TSDBKEY* pKey, int32_t order, SVersionRange* pRange);
|
static bool hasBeenDropped(const SArray* pDelList, int32_t* index, TSDBKEY* pKey, int32_t order, SVersionRange* pVerRange);
|
||||||
|
|
||||||
static int32_t doMergeMemTableMultiRows(TSDBROW* pRow, uint64_t uid, SIterInfo* pIter, SArray* pDelList,
|
static int32_t doMergeMemTableMultiRows(TSDBROW* pRow, uint64_t uid, SIterInfo* pIter, SArray* pDelList,
|
||||||
STSRow** pTSRow, STsdbReader* pReader, bool* freeTSRow);
|
STSRow** pTSRow, STsdbReader* pReader, bool* freeTSRow);
|
||||||
|
|
@ -208,7 +208,6 @@ static bool hasDataInLastBlock(SLastBlockReader* pLastBlockReader);
|
||||||
static int32_t doBuildDataBlock(STsdbReader* pReader);
|
static int32_t doBuildDataBlock(STsdbReader* pReader);
|
||||||
static TSDBKEY getCurrentKeyInBuf(STableBlockScanInfo* pScanInfo, STsdbReader* pReader);
|
static TSDBKEY getCurrentKeyInBuf(STableBlockScanInfo* pScanInfo, STsdbReader* pReader);
|
||||||
static bool hasDataInFileBlock(const SBlockData* pBlockData, const SFileBlockDumpInfo* pDumpInfo);
|
static bool hasDataInFileBlock(const SBlockData* pBlockData, const SFileBlockDumpInfo* pDumpInfo);
|
||||||
static bool hasDataInLastBlock(SLastBlockReader* pLastBlockReader);
|
|
||||||
|
|
||||||
static bool outOfTimeWindow(int64_t ts, STimeWindow* pWindow) { return (ts > pWindow->ekey) || (ts < pWindow->skey); }
|
static bool outOfTimeWindow(int64_t ts, STimeWindow* pWindow) { return (ts > pWindow->ekey) || (ts < pWindow->skey); }
|
||||||
|
|
||||||
|
|
@ -534,7 +533,7 @@ static SSDataBlock* createResBlock(SQueryTableDataCond* pCond, int32_t capacity)
|
||||||
}
|
}
|
||||||
|
|
||||||
for (int32_t i = 0; i < pCond->numOfCols; ++i) {
|
for (int32_t i = 0; i < pCond->numOfCols; ++i) {
|
||||||
SColumnInfoData colInfo = {{0}, 0};
|
SColumnInfoData colInfo = {0, {0}};
|
||||||
colInfo.info = pCond->colList[i];
|
colInfo.info = pCond->colList[i];
|
||||||
blockDataAppendColInfo(pResBlock, &colInfo);
|
blockDataAppendColInfo(pResBlock, &colInfo);
|
||||||
}
|
}
|
||||||
|
|
@ -1529,8 +1528,8 @@ static bool tryCopyDistinctRowFromFileBlock(STsdbReader* pReader, SBlockData* pB
|
||||||
// opt version
|
// opt version
|
||||||
// 1. it is not a border point
|
// 1. it is not a border point
|
||||||
// 2. the direct next point is not an duplicated timestamp
|
// 2. the direct next point is not an duplicated timestamp
|
||||||
if ((pDumpInfo->rowIndex < pDumpInfo->totalRows - 1 && pReader->order == TSDB_ORDER_ASC) ||
|
bool asc = (pReader->order == TSDB_ORDER_ASC);
|
||||||
(pDumpInfo->rowIndex > 0 && pReader->order == TSDB_ORDER_DESC)) {
|
if ((pDumpInfo->rowIndex < pDumpInfo->totalRows - 1 && asc) || (pDumpInfo->rowIndex > 0 && (!asc))) {
|
||||||
int32_t step = pReader->order == TSDB_ORDER_ASC ? 1 : -1;
|
int32_t step = pReader->order == TSDB_ORDER_ASC ? 1 : -1;
|
||||||
|
|
||||||
int64_t nextKey = pBlockData->aTSKEY[pDumpInfo->rowIndex + step];
|
int64_t nextKey = pBlockData->aTSKEY[pDumpInfo->rowIndex + step];
|
||||||
|
|
@ -1749,7 +1748,7 @@ static int32_t doMergeBufAndFileRows(STsdbReader* pReader, STableBlockScanInfo*
|
||||||
return code;
|
return code;
|
||||||
}
|
}
|
||||||
|
|
||||||
doAppendRowFromTSRow(pReader->pResBlock, pReader, pTSRow, pBlockScanInfo->uid);
|
doAppendRowFromTSRow(pReader->pResBlock, pReader, pTSRow, pBlockScanInfo);
|
||||||
|
|
||||||
taosMemoryFree(pTSRow);
|
taosMemoryFree(pTSRow);
|
||||||
tRowMergerClear(&merge);
|
tRowMergerClear(&merge);
|
||||||
|
|
@ -1770,6 +1769,7 @@ static int32_t doMergeFileBlockAndLastBlock(SLastBlockReader* pLastBlockReader,
|
||||||
// only last block exists
|
// only last block exists
|
||||||
if ((!mergeBlockData) || (tsLastBlock != pBlockData->aTSKEY[pDumpInfo->rowIndex])) {
|
if ((!mergeBlockData) || (tsLastBlock != pBlockData->aTSKEY[pDumpInfo->rowIndex])) {
|
||||||
if (tryCopyDistinctRowFromSttBlock(&fRow, pLastBlockReader, pBlockScanInfo, tsLastBlock, pReader)) {
|
if (tryCopyDistinctRowFromSttBlock(&fRow, pLastBlockReader, pBlockScanInfo, tsLastBlock, pReader)) {
|
||||||
|
pBlockScanInfo->lastKey = tsLastBlock;
|
||||||
return TSDB_CODE_SUCCESS;
|
return TSDB_CODE_SUCCESS;
|
||||||
} else {
|
} else {
|
||||||
int32_t code = tRowMergerInit(&merge, &fRow, pReader->pSchema);
|
int32_t code = tRowMergerInit(&merge, &fRow, pReader->pSchema);
|
||||||
|
|
@ -1786,7 +1786,7 @@ static int32_t doMergeFileBlockAndLastBlock(SLastBlockReader* pLastBlockReader,
|
||||||
return code;
|
return code;
|
||||||
}
|
}
|
||||||
|
|
||||||
doAppendRowFromTSRow(pReader->pResBlock, pReader, pTSRow, pBlockScanInfo->uid);
|
doAppendRowFromTSRow(pReader->pResBlock, pReader, pTSRow, pBlockScanInfo);
|
||||||
|
|
||||||
taosMemoryFree(pTSRow);
|
taosMemoryFree(pTSRow);
|
||||||
tRowMergerClear(&merge);
|
tRowMergerClear(&merge);
|
||||||
|
|
@ -1810,7 +1810,7 @@ static int32_t doMergeFileBlockAndLastBlock(SLastBlockReader* pLastBlockReader,
|
||||||
return code;
|
return code;
|
||||||
}
|
}
|
||||||
|
|
||||||
doAppendRowFromTSRow(pReader->pResBlock, pReader, pTSRow, pBlockScanInfo->uid);
|
doAppendRowFromTSRow(pReader->pResBlock, pReader, pTSRow, pBlockScanInfo);
|
||||||
|
|
||||||
taosMemoryFree(pTSRow);
|
taosMemoryFree(pTSRow);
|
||||||
tRowMergerClear(&merge);
|
tRowMergerClear(&merge);
|
||||||
|
|
@ -1858,7 +1858,7 @@ static int32_t mergeFileBlockAndLastBlock(STsdbReader* pReader, SLastBlockReader
|
||||||
return code;
|
return code;
|
||||||
}
|
}
|
||||||
|
|
||||||
doAppendRowFromTSRow(pReader->pResBlock, pReader, pTSRow, pBlockScanInfo->uid);
|
doAppendRowFromTSRow(pReader->pResBlock, pReader, pTSRow, pBlockScanInfo);
|
||||||
|
|
||||||
taosMemoryFree(pTSRow);
|
taosMemoryFree(pTSRow);
|
||||||
tRowMergerClear(&merge);
|
tRowMergerClear(&merge);
|
||||||
|
|
@ -2082,7 +2082,7 @@ static int32_t doMergeMultiLevelRows(STsdbReader* pReader, STableBlockScanInfo*
|
||||||
return code;
|
return code;
|
||||||
}
|
}
|
||||||
|
|
||||||
doAppendRowFromTSRow(pReader->pResBlock, pReader, pTSRow, pBlockScanInfo->uid);
|
doAppendRowFromTSRow(pReader->pResBlock, pReader, pTSRow, pBlockScanInfo);
|
||||||
|
|
||||||
taosMemoryFree(pTSRow);
|
taosMemoryFree(pTSRow);
|
||||||
tRowMergerClear(&merge);
|
tRowMergerClear(&merge);
|
||||||
|
|
@ -2233,6 +2233,7 @@ int32_t mergeRowsInFileBlocks(SBlockData* pBlockData, STableBlockScanInfo* pBloc
|
||||||
STsdbReader* pReader) {
|
STsdbReader* pReader) {
|
||||||
SFileBlockDumpInfo* pDumpInfo = &pReader->status.fBlockDumpInfo;
|
SFileBlockDumpInfo* pDumpInfo = &pReader->status.fBlockDumpInfo;
|
||||||
if (tryCopyDistinctRowFromFileBlock(pReader, pBlockData, key, pDumpInfo)) {
|
if (tryCopyDistinctRowFromFileBlock(pReader, pBlockData, key, pDumpInfo)) {
|
||||||
|
pBlockScanInfo->lastKey = key;
|
||||||
return TSDB_CODE_SUCCESS;
|
return TSDB_CODE_SUCCESS;
|
||||||
} else {
|
} else {
|
||||||
TSDBROW fRow = tsdbRowFromBlockData(pBlockData, pDumpInfo->rowIndex);
|
TSDBROW fRow = tsdbRowFromBlockData(pBlockData, pDumpInfo->rowIndex);
|
||||||
|
|
@ -2251,7 +2252,7 @@ int32_t mergeRowsInFileBlocks(SBlockData* pBlockData, STableBlockScanInfo* pBloc
|
||||||
return code;
|
return code;
|
||||||
}
|
}
|
||||||
|
|
||||||
doAppendRowFromTSRow(pReader->pResBlock, pReader, pTSRow, pBlockScanInfo->uid);
|
doAppendRowFromTSRow(pReader->pResBlock, pReader, pTSRow, pBlockScanInfo);
|
||||||
|
|
||||||
taosMemoryFree(pTSRow);
|
taosMemoryFree(pTSRow);
|
||||||
tRowMergerClear(&merge);
|
tRowMergerClear(&merge);
|
||||||
|
|
@ -2299,29 +2300,32 @@ static int32_t buildComposedDataBlock(STsdbReader* pReader) {
|
||||||
SFileDataBlockInfo* pBlockInfo = getCurrentBlockInfo(&pReader->status.blockIter);
|
SFileDataBlockInfo* pBlockInfo = getCurrentBlockInfo(&pReader->status.blockIter);
|
||||||
SLastBlockReader* pLastBlockReader = pReader->status.fileIter.pLastBlockReader;
|
SLastBlockReader* pLastBlockReader = pReader->status.fileIter.pLastBlockReader;
|
||||||
|
|
||||||
|
bool asc = ASCENDING_TRAVERSE(pReader->order);
|
||||||
int64_t st = taosGetTimestampUs();
|
int64_t st = taosGetTimestampUs();
|
||||||
|
int32_t step = asc ? 1 : -1;
|
||||||
|
|
||||||
STableBlockScanInfo* pBlockScanInfo = NULL;
|
STableBlockScanInfo* pBlockScanInfo = NULL;
|
||||||
if (pBlockInfo != NULL) {
|
if (pBlockInfo != NULL) {
|
||||||
pBlockScanInfo = *(STableBlockScanInfo**)taosHashGet(pReader->status.pTableMap, &pBlockInfo->uid, sizeof(pBlockInfo->uid));
|
void* p = taosHashGet(pReader->status.pTableMap, &pBlockInfo->uid, sizeof(pBlockInfo->uid));
|
||||||
if (pBlockScanInfo == NULL) {
|
if (p == NULL) {
|
||||||
code = TSDB_CODE_INVALID_PARA;
|
code = TSDB_CODE_INVALID_PARA;
|
||||||
tsdbError("failed to locate the uid:%" PRIu64 " in query table uid list, total tables:%d, %s", pBlockInfo->uid,
|
tsdbError("failed to locate the uid:%" PRIu64 " in query table uid list, total tables:%d, %s", pBlockInfo->uid,
|
||||||
taosHashGetSize(pReader->status.pTableMap), pReader->idStr);
|
taosHashGetSize(pReader->status.pTableMap), pReader->idStr);
|
||||||
goto _end;
|
goto _end;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pBlockScanInfo = *(STableBlockScanInfo**) p;
|
||||||
|
|
||||||
SDataBlk* pBlock = getCurrentBlock(&pReader->status.blockIter);
|
SDataBlk* pBlock = getCurrentBlock(&pReader->status.blockIter);
|
||||||
TSDBKEY keyInBuf = getCurrentKeyInBuf(pBlockScanInfo, pReader);
|
TSDBKEY keyInBuf = getCurrentKeyInBuf(pBlockScanInfo, pReader);
|
||||||
|
|
||||||
// it is a clean block, load it directly
|
// it is a clean block, load it directly
|
||||||
if (isCleanFileDataBlock(pReader, pBlockInfo, pBlock, pBlockScanInfo, keyInBuf, pLastBlockReader)) {
|
if (isCleanFileDataBlock(pReader, pBlockInfo, pBlock, pBlockScanInfo, keyInBuf, pLastBlockReader)) {
|
||||||
if (pReader->order == TSDB_ORDER_ASC ||
|
if (asc || ((!asc) && (!hasDataInLastBlock(pLastBlockReader)))) {
|
||||||
(pReader->order == TSDB_ORDER_DESC && (!hasDataInLastBlock(pLastBlockReader)))) {
|
|
||||||
copyBlockDataToSDataBlock(pReader, pBlockScanInfo);
|
copyBlockDataToSDataBlock(pReader, pBlockScanInfo);
|
||||||
|
|
||||||
// record the last key value
|
// record the last key value
|
||||||
pBlockScanInfo->lastKey = ASCENDING_TRAVERSE(pReader->order)? pBlock->maxKey.ts:pBlock->minKey.ts;
|
pBlockScanInfo->lastKey = asc? pBlock->maxKey.ts:pBlock->minKey.ts;
|
||||||
goto _end;
|
goto _end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -2331,7 +2335,6 @@ static int32_t buildComposedDataBlock(STsdbReader* pReader) {
|
||||||
|
|
||||||
SFileBlockDumpInfo* pDumpInfo = &pReader->status.fBlockDumpInfo;
|
SFileBlockDumpInfo* pDumpInfo = &pReader->status.fBlockDumpInfo;
|
||||||
SBlockData* pBlockData = &pReader->status.fileBlockData;
|
SBlockData* pBlockData = &pReader->status.fileBlockData;
|
||||||
int32_t step = ASCENDING_TRAVERSE(pReader->order) ? 1 : -1;
|
|
||||||
|
|
||||||
while (1) {
|
while (1) {
|
||||||
bool hasBlockData = false;
|
bool hasBlockData = false;
|
||||||
|
|
@ -3220,7 +3223,6 @@ int32_t doMergeRowsInFileBlocks(SBlockData* pBlockData, STableBlockScanInfo* pSc
|
||||||
|
|
||||||
int32_t doMergeRowsInLastBlock(SLastBlockReader* pLastBlockReader, STableBlockScanInfo* pScanInfo, int64_t ts,
|
int32_t doMergeRowsInLastBlock(SLastBlockReader* pLastBlockReader, STableBlockScanInfo* pScanInfo, int64_t ts,
|
||||||
SRowMerger* pMerger, SVersionRange* pVerRange) {
|
SRowMerger* pMerger, SVersionRange* pVerRange) {
|
||||||
pScanInfo->lastKey = ts;
|
|
||||||
while (nextRowFromLastBlocks(pLastBlockReader, pScanInfo, pVerRange)) {
|
while (nextRowFromLastBlocks(pLastBlockReader, pScanInfo, pVerRange)) {
|
||||||
int64_t next1 = getCurrentKeyInLastBlock(pLastBlockReader);
|
int64_t next1 = getCurrentKeyInLastBlock(pLastBlockReader);
|
||||||
if (next1 == ts) {
|
if (next1 == ts) {
|
||||||
|
|
@ -3413,9 +3415,10 @@ int32_t tsdbGetNextRowInMem(STableBlockScanInfo* pBlockScanInfo, STsdbReader* pR
|
||||||
return TSDB_CODE_SUCCESS;
|
return TSDB_CODE_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
int32_t doAppendRowFromTSRow(SSDataBlock* pBlock, STsdbReader* pReader, STSRow* pTSRow, uint64_t uid) {
|
int32_t doAppendRowFromTSRow(SSDataBlock* pBlock, STsdbReader* pReader, STSRow* pTSRow, STableBlockScanInfo* pScanInfo) {
|
||||||
int32_t numOfRows = pBlock->info.rows;
|
int32_t numOfRows = pBlock->info.rows;
|
||||||
int32_t numOfCols = (int32_t)taosArrayGetSize(pBlock->pDataBlock);
|
int32_t numOfCols = (int32_t)taosArrayGetSize(pBlock->pDataBlock);
|
||||||
|
int64_t uid = pScanInfo->uid;
|
||||||
|
|
||||||
SBlockLoadSuppInfo* pSupInfo = &pReader->suppInfo;
|
SBlockLoadSuppInfo* pSupInfo = &pReader->suppInfo;
|
||||||
STSchema* pSchema = doGetSchemaForTSRow(pTSRow->sver, pReader, uid);
|
STSchema* pSchema = doGetSchemaForTSRow(pTSRow->sver, pReader, uid);
|
||||||
|
|
@ -3454,6 +3457,7 @@ int32_t doAppendRowFromTSRow(SSDataBlock* pBlock, STsdbReader* pReader, STSRow*
|
||||||
}
|
}
|
||||||
|
|
||||||
pBlock->info.rows += 1;
|
pBlock->info.rows += 1;
|
||||||
|
pScanInfo->lastKey = pTSRow->ts;
|
||||||
return TSDB_CODE_SUCCESS;
|
return TSDB_CODE_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -3517,7 +3521,8 @@ int32_t buildDataBlockFromBufImpl(STableBlockScanInfo* pBlockScanInfo, int64_t e
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
doAppendRowFromTSRow(pBlock, pReader, pTSRow, pBlockScanInfo->uid);
|
doAppendRowFromTSRow(pBlock, pReader, pTSRow, pBlockScanInfo);
|
||||||
|
|
||||||
if (freeTSRow) {
|
if (freeTSRow) {
|
||||||
taosMemoryFree(pTSRow);
|
taosMemoryFree(pTSRow);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -421,7 +421,7 @@ static SColumnInfoData* getColInfoResult(void* metaHandle, int64_t suid, SArray*
|
||||||
}
|
}
|
||||||
|
|
||||||
for (int32_t i = 0; i < taosArrayGetSize(ctx.cInfoList); ++i) {
|
for (int32_t i = 0; i < taosArrayGetSize(ctx.cInfoList); ++i) {
|
||||||
SColumnInfoData colInfo = {{0}, 0};
|
SColumnInfoData colInfo = {0, {0}};
|
||||||
colInfo.info = *(SColumnInfo*)taosArrayGet(ctx.cInfoList, i);
|
colInfo.info = *(SColumnInfo*)taosArrayGet(ctx.cInfoList, i);
|
||||||
blockDataAppendColInfo(pResBlock, &colInfo);
|
blockDataAppendColInfo(pResBlock, &colInfo);
|
||||||
}
|
}
|
||||||
|
|
@ -582,7 +582,7 @@ int32_t getColInfoResultForGroupby(void* metaHandle, SNodeList* group, STableLis
|
||||||
}
|
}
|
||||||
|
|
||||||
for (int32_t i = 0; i < taosArrayGetSize(ctx.cInfoList); ++i) {
|
for (int32_t i = 0; i < taosArrayGetSize(ctx.cInfoList); ++i) {
|
||||||
SColumnInfoData colInfo = {{0}, 0};
|
SColumnInfoData colInfo = {0, {0}};
|
||||||
colInfo.info = *(SColumnInfo*)taosArrayGet(ctx.cInfoList, i);
|
colInfo.info = *(SColumnInfo*)taosArrayGet(ctx.cInfoList, i);
|
||||||
blockDataAppendColInfo(pResBlock, &colInfo);
|
blockDataAppendColInfo(pResBlock, &colInfo);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -2783,8 +2783,10 @@ int32_t getBufferPgSize(int32_t rowSize, uint32_t* defaultPgsz, uint32_t* defaul
|
||||||
*defaultPgsz <<= 1u;
|
*defaultPgsz <<= 1u;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// The default buffer for each operator in query is 10MB.
|
||||||
// at least four pages need to be in buffer
|
// at least four pages need to be in buffer
|
||||||
*defaultBufsz = 4096 * 256;
|
// TODO: make this variable to be configurable.
|
||||||
|
*defaultBufsz = 4096 * 2560;
|
||||||
if ((*defaultBufsz) <= (*defaultPgsz)) {
|
if ((*defaultBufsz) <= (*defaultPgsz)) {
|
||||||
(*defaultBufsz) = (*defaultPgsz) * 4;
|
(*defaultBufsz) = (*defaultPgsz) * 4;
|
||||||
}
|
}
|
||||||
|
|
@ -2971,7 +2973,7 @@ SOperatorInfo* createAggregateOperatorInfo(SOperatorInfo* downstream, SAggPhysiN
|
||||||
|
|
||||||
return pOperator;
|
return pOperator;
|
||||||
|
|
||||||
_error:
|
_error:
|
||||||
if (pInfo != NULL) {
|
if (pInfo != NULL) {
|
||||||
destroyAggOperatorInfo(pInfo);
|
destroyAggOperatorInfo(pInfo);
|
||||||
}
|
}
|
||||||
|
|
@ -3187,11 +3189,12 @@ SOperatorInfo* createFillOperatorInfo(SOperatorInfo* downstream, SFillPhysiNode*
|
||||||
code = appendDownstream(pOperator, &downstream, 1);
|
code = appendDownstream(pOperator, &downstream, 1);
|
||||||
return pOperator;
|
return pOperator;
|
||||||
|
|
||||||
_error:
|
_error:
|
||||||
if (pInfo != NULL) {
|
if (pInfo != NULL) {
|
||||||
destroyFillOperatorInfo(pInfo);
|
destroyFillOperatorInfo(pInfo);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pTaskInfo->code = code;
|
||||||
taosMemoryFreeClear(pOperator);
|
taosMemoryFreeClear(pOperator);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,303 +1,312 @@
|
||||||
###################################################################
|
###################################################################
|
||||||
# Copyright (c) 2016 by TAOS Technologies, Inc.
|
# Copyright (c) 2016 by TAOS Technologies, Inc.
|
||||||
# All rights reserved.
|
# All rights reserved.
|
||||||
#
|
#
|
||||||
# This file is proprietary and confidential to TAOS Technologies.
|
# This file is proprietary and confidential to TAOS Technologies.
|
||||||
# No part of this file may be reproduced, stored, transmitted,
|
# No part of this file may be reproduced, stored, transmitted,
|
||||||
# disclosed or used in any form or by any means other than as
|
# disclosed or used in any form or by any means other than as
|
||||||
# expressly provided by the written permission from Jianhui Tao
|
# expressly provided by the written permission from Jianhui Tao
|
||||||
#
|
#
|
||||||
###################################################################
|
###################################################################
|
||||||
|
|
||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
import random
|
import random
|
||||||
import string
|
import string
|
||||||
|
|
||||||
from numpy import logspace
|
from numpy import logspace
|
||||||
from util import constant
|
from util import constant
|
||||||
from util.log import *
|
from util.log import *
|
||||||
from util.cases import *
|
from util.cases import *
|
||||||
from util.sql import *
|
from util.sql import *
|
||||||
from util.common import *
|
from util.common import *
|
||||||
from util.sqlset import TDSetSql
|
from util.sqlset import TDSetSql
|
||||||
|
|
||||||
class TDTestCase:
|
class TDTestCase:
|
||||||
def init(self, conn, logSql, replicaVar=1):
|
def init(self, conn, logSql, replicaVar=1):
|
||||||
self.replicaVar = int(replicaVar)
|
self.replicaVar = int(replicaVar)
|
||||||
tdLog.debug("start to execute %s" % __file__)
|
tdLog.debug("start to execute %s" % __file__)
|
||||||
tdSql.init(conn.cursor(), True)
|
tdSql.init(conn.cursor(), True)
|
||||||
self.dbname = 'db_test'
|
self.dbname = 'db_test'
|
||||||
self.setsql = TDSetSql()
|
self.setsql = TDSetSql()
|
||||||
self.stbname = 'stb'
|
self.stbname = 'stb'
|
||||||
self.ntbname = 'ntb'
|
self.ntbname = 'ntb'
|
||||||
self.rowNum = 5
|
self.rowNum = 10
|
||||||
self.tbnum = 2
|
self.tbnum = 3
|
||||||
self.ts = 1537146000000
|
self.ts = 1537146000000
|
||||||
self.binary_str = 'taosdata'
|
self.binary_str = 'taosdata'
|
||||||
self.nchar_str = '涛思数据'
|
self.nchar_str = '涛思数据'
|
||||||
self.str_length = 20
|
self.str_length = 20
|
||||||
self.column_dict = {
|
self.column_dict = {
|
||||||
'col1': 'tinyint',
|
'col1': 'tinyint',
|
||||||
'col2': 'smallint',
|
'col2': 'smallint',
|
||||||
'col3': 'int',
|
'col3': 'int',
|
||||||
'col4': 'bigint',
|
'col4': 'bigint',
|
||||||
'col5': 'tinyint unsigned',
|
'col5': 'tinyint unsigned',
|
||||||
'col6': 'smallint unsigned',
|
'col6': 'smallint unsigned',
|
||||||
'col7': 'int unsigned',
|
'col7': 'int unsigned',
|
||||||
'col8': 'bigint unsigned',
|
'col8': 'bigint unsigned',
|
||||||
'col9': 'float',
|
'col9': 'float',
|
||||||
'col10': 'double',
|
'col10': 'double',
|
||||||
'col11': 'bool',
|
'col11': 'bool',
|
||||||
'col12': f'binary({self.str_length})',
|
'col12': f'binary({self.str_length})',
|
||||||
'col13': f'nchar({self.str_length})',
|
'col13': f'nchar({self.str_length})',
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
self.tinyint_val = random.randint(constant.TINYINT_MIN,constant.TINYINT_MAX)
|
self.tinyint_val = random.randint(constant.TINYINT_MIN,constant.TINYINT_MAX)
|
||||||
self.smallint_val = random.randint(constant.SMALLINT_MIN,constant.SMALLINT_MAX)
|
self.smallint_val = random.randint(constant.SMALLINT_MIN,constant.SMALLINT_MAX)
|
||||||
self.int_val = random.randint(constant.INT_MIN,constant.INT_MAX)
|
self.int_val = random.randint(constant.INT_MIN,constant.INT_MAX)
|
||||||
self.bigint_val = random.randint(constant.BIGINT_MIN,constant.BIGINT_MAX)
|
self.bigint_val = random.randint(constant.BIGINT_MIN,constant.BIGINT_MAX)
|
||||||
self.untingint_val = random.randint(constant.TINYINT_UN_MIN,constant.TINYINT_UN_MAX)
|
self.untingint_val = random.randint(constant.TINYINT_UN_MIN,constant.TINYINT_UN_MAX)
|
||||||
self.unsmallint_val = random.randint(constant.SMALLINT_UN_MIN,constant.SMALLINT_UN_MAX)
|
self.unsmallint_val = random.randint(constant.SMALLINT_UN_MIN,constant.SMALLINT_UN_MAX)
|
||||||
self.unint_val = random.randint(constant.INT_UN_MIN,constant.INT_MAX)
|
self.unint_val = random.randint(constant.INT_UN_MIN,constant.INT_MAX)
|
||||||
self.unbigint_val = random.randint(constant.BIGINT_UN_MIN,constant.BIGINT_UN_MAX)
|
self.unbigint_val = random.randint(constant.BIGINT_UN_MIN,constant.BIGINT_UN_MAX)
|
||||||
self.float_val = random.uniform(constant.FLOAT_MIN,constant.FLOAT_MAX)
|
self.float_val = random.uniform(constant.FLOAT_MIN,constant.FLOAT_MAX)
|
||||||
self.double_val = random.uniform(constant.DOUBLE_MIN*(1E-300),constant.DOUBLE_MAX*(1E-300))
|
self.double_val = random.uniform(constant.DOUBLE_MIN*(1E-300),constant.DOUBLE_MAX*(1E-300))
|
||||||
self.bool_val = random.randint(0,100)%2
|
self.bool_val = random.randint(0,100)%2
|
||||||
self.binary_val = tdCom.getLongName(random.randint(0,self.str_length))
|
self.binary_val = tdCom.getLongName(random.randint(0,self.str_length))
|
||||||
self.nchar_val = tdCom.getLongName(random.randint(0,self.str_length))
|
self.nchar_val = tdCom.getLongName(random.randint(0,self.str_length))
|
||||||
self.base_data = {
|
self.base_data = {
|
||||||
'tinyint':self.tinyint_val,
|
'tinyint':self.tinyint_val,
|
||||||
'smallint':self.smallint_val,
|
'smallint':self.smallint_val,
|
||||||
'int':self.int_val,
|
'int':self.int_val,
|
||||||
'bigint':self.bigint_val,
|
'bigint':self.bigint_val,
|
||||||
'tinyint unsigned':self.untingint_val,
|
'tinyint unsigned':self.untingint_val,
|
||||||
'smallint unsigned':self.unsmallint_val,
|
'smallint unsigned':self.unsmallint_val,
|
||||||
'int unsigned':self.unint_val,
|
'int unsigned':self.unint_val,
|
||||||
'bigint unsigned':self.unbigint_val,
|
'bigint unsigned':self.unbigint_val,
|
||||||
'bool':self.bool_val,
|
'bool':self.bool_val,
|
||||||
'float':self.float_val,
|
'float':self.float_val,
|
||||||
'double':self.double_val,
|
'double':self.double_val,
|
||||||
'binary':self.binary_val,
|
'binary':self.binary_val,
|
||||||
'nchar':self.nchar_val
|
'nchar':self.nchar_val
|
||||||
}
|
}
|
||||||
|
|
||||||
def insert_base_data(self,col_type,tbname,rows,base_data):
|
def insert_base_data(self,col_type,tbname,rows,base_data):
|
||||||
for i in range(rows):
|
for i in range(rows):
|
||||||
if col_type.lower() == 'tinyint':
|
if col_type.lower() == 'tinyint':
|
||||||
tdSql.execute(f'insert into {tbname} values({self.ts+i},{base_data["tinyint"]})')
|
tdSql.execute(f'insert into {tbname} values({self.ts+i},{base_data["tinyint"]})')
|
||||||
elif col_type.lower() == 'smallint':
|
elif col_type.lower() == 'smallint':
|
||||||
tdSql.execute(f'insert into {tbname} values({self.ts+i},{base_data["smallint"]})')
|
tdSql.execute(f'insert into {tbname} values({self.ts+i},{base_data["smallint"]})')
|
||||||
elif col_type.lower() == 'int':
|
elif col_type.lower() == 'int':
|
||||||
tdSql.execute(f'insert into {tbname} values({self.ts+i},{base_data["int"]})')
|
tdSql.execute(f'insert into {tbname} values({self.ts+i},{base_data["int"]})')
|
||||||
elif col_type.lower() == 'bigint':
|
elif col_type.lower() == 'bigint':
|
||||||
tdSql.execute(f'insert into {tbname} values({self.ts+i},{base_data["bigint"]})')
|
tdSql.execute(f'insert into {tbname} values({self.ts+i},{base_data["bigint"]})')
|
||||||
elif col_type.lower() == 'tinyint unsigned':
|
elif col_type.lower() == 'tinyint unsigned':
|
||||||
tdSql.execute(f'insert into {tbname} values({self.ts+i},{base_data["tinyint unsigned"]})')
|
tdSql.execute(f'insert into {tbname} values({self.ts+i},{base_data["tinyint unsigned"]})')
|
||||||
elif col_type.lower() == 'smallint unsigned':
|
elif col_type.lower() == 'smallint unsigned':
|
||||||
tdSql.execute(f'insert into {tbname} values({self.ts+i},{base_data["smallint unsigned"]})')
|
tdSql.execute(f'insert into {tbname} values({self.ts+i},{base_data["smallint unsigned"]})')
|
||||||
elif col_type.lower() == 'int unsigned':
|
elif col_type.lower() == 'int unsigned':
|
||||||
tdSql.execute(f'insert into {tbname} values({self.ts+i},{base_data["int unsigned"]})')
|
tdSql.execute(f'insert into {tbname} values({self.ts+i},{base_data["int unsigned"]})')
|
||||||
elif col_type.lower() == 'bigint unsigned':
|
elif col_type.lower() == 'bigint unsigned':
|
||||||
tdSql.execute(f'insert into {tbname} values({self.ts+i},{base_data["bigint unsigned"]})')
|
tdSql.execute(f'insert into {tbname} values({self.ts+i},{base_data["bigint unsigned"]})')
|
||||||
elif col_type.lower() == 'bool':
|
elif col_type.lower() == 'bool':
|
||||||
tdSql.execute(f'insert into {tbname} values({self.ts+i},{base_data["bool"]})')
|
tdSql.execute(f'insert into {tbname} values({self.ts+i},{base_data["bool"]})')
|
||||||
elif col_type.lower() == 'float':
|
elif col_type.lower() == 'float':
|
||||||
tdSql.execute(f'insert into {tbname} values({self.ts+i},{base_data["float"]})')
|
tdSql.execute(f'insert into {tbname} values({self.ts+i},{base_data["float"]})')
|
||||||
elif col_type.lower() == 'double':
|
elif col_type.lower() == 'double':
|
||||||
tdSql.execute(f'insert into {tbname} values({self.ts+i},{base_data["double"]})')
|
tdSql.execute(f'insert into {tbname} values({self.ts+i},{base_data["double"]})')
|
||||||
elif 'binary' in col_type.lower():
|
elif 'binary' in col_type.lower():
|
||||||
tdSql.execute(f'''insert into {tbname} values({self.ts+i},"{base_data['binary']}")''')
|
tdSql.execute(f'''insert into {tbname} values({self.ts+i},"{base_data['binary']}")''')
|
||||||
elif 'nchar' in col_type.lower():
|
elif 'nchar' in col_type.lower():
|
||||||
tdSql.execute(f'''insert into {tbname} values({self.ts+i},"{base_data['nchar']}")''')
|
tdSql.execute(f'''insert into {tbname} values({self.ts+i},"{base_data['nchar']}")''')
|
||||||
def delete_all_data(self,tbname,col_type,row_num,base_data,dbname,tb_type,tb_num=1):
|
def delete_all_data(self,tbname,col_type,row_num,base_data,dbname,tb_type,tb_num=1,stbname=''):
|
||||||
tdSql.execute(f'delete from {tbname}')
|
tdSql.query(f'select count(*) from {tbname}')
|
||||||
tdSql.execute(f'flush database {dbname}')
|
tdSql.execute(f'delete from {tbname}')
|
||||||
tdSql.execute('reset query cache')
|
tdSql.execute(f'flush database {dbname}')
|
||||||
tdSql.query(f'select * from {tbname}')
|
tdSql.execute('reset query cache')
|
||||||
tdSql.checkRows(0)
|
tdSql.query(f'select * from {tbname}')
|
||||||
if tb_type == 'ntb' or tb_type == 'ctb':
|
tdSql.checkRows(0)
|
||||||
self.insert_base_data(col_type,tbname,row_num,base_data)
|
if tb_type == 'ntb' or tb_type == 'ctb':
|
||||||
elif tb_type == 'stb':
|
if tb_type == 'ctb':
|
||||||
for i in range(tb_num):
|
tdSql.query(f'select count(*) from {stbname}')
|
||||||
self.insert_base_data(col_type,f'{tbname}_{i}',row_num,base_data)
|
if tb_num <= 1:
|
||||||
tdSql.execute(f'flush database {dbname}')
|
if len(tdSql.queryResult) != 0:
|
||||||
tdSql.execute('reset query cache')
|
tdLog.exit('delete case failure!')
|
||||||
tdSql.query(f'select * from {tbname}')
|
else:
|
||||||
if tb_type == 'ntb' or tb_type == 'ctb':
|
tdSql.checkEqual(tdSql.queryResult[0][0],(tb_num-1)*row_num)
|
||||||
tdSql.checkRows(row_num)
|
|
||||||
elif tb_type =='stb':
|
self.insert_base_data(col_type,tbname,row_num,base_data)
|
||||||
tdSql.checkRows(row_num*tb_num)
|
elif tb_type == 'stb':
|
||||||
def delete_one_row(self,tbname,column_type,column_name,base_data,row_num,dbname,tb_type,tb_num=1):
|
for i in range(tb_num):
|
||||||
tdSql.execute(f'delete from {tbname} where ts={self.ts}')
|
self.insert_base_data(col_type,f'{tbname}_{i}',row_num,base_data)
|
||||||
tdSql.execute(f'flush database {dbname}')
|
tdSql.execute(f'flush database {dbname}')
|
||||||
tdSql.execute('reset query cache')
|
tdSql.execute('reset query cache')
|
||||||
tdSql.query(f'select {column_name} from {tbname}')
|
tdSql.query(f'select * from {tbname}')
|
||||||
if tb_type == 'ntb' or tb_type == 'ctb':
|
if tb_type == 'ntb' or tb_type == 'ctb':
|
||||||
tdSql.checkRows(row_num-1)
|
tdSql.checkRows(row_num)
|
||||||
elif tb_type == 'stb':
|
elif tb_type =='stb':
|
||||||
tdSql.checkRows((row_num-1)*tb_num)
|
tdSql.checkRows(row_num*tb_num)
|
||||||
tdSql.query(f'select {column_name} from {tbname} where ts={self.ts}')
|
def delete_one_row(self,tbname,column_type,column_name,base_data,row_num,dbname,tb_type,tb_num=1):
|
||||||
tdSql.checkRows(0)
|
tdSql.execute(f'delete from {tbname} where ts={self.ts}')
|
||||||
if tb_type == 'ntb' or tb_type == 'ctb':
|
tdSql.execute(f'flush database {dbname}')
|
||||||
if 'binary' in column_type.lower():
|
tdSql.execute('reset query cache')
|
||||||
tdSql.execute(f'''insert into {tbname} values({self.ts},"{base_data['binary']}")''')
|
tdSql.query(f'select {column_name} from {tbname}')
|
||||||
elif 'nchar' in column_type.lower():
|
if tb_type == 'ntb' or tb_type == 'ctb':
|
||||||
tdSql.execute(f'''insert into {tbname} values({self.ts},"{base_data['nchar']}")''')
|
tdSql.checkRows(row_num-1)
|
||||||
else:
|
elif tb_type == 'stb':
|
||||||
tdSql.execute(f'insert into {tbname} values({self.ts},{base_data[column_type]})')
|
tdSql.checkRows((row_num-1)*tb_num)
|
||||||
elif tb_type == 'stb':
|
tdSql.query(f'select {column_name} from {tbname} where ts={self.ts}')
|
||||||
for i in range(tb_num):
|
tdSql.checkRows(0)
|
||||||
if 'binary' in column_type.lower():
|
if tb_type == 'ntb' or tb_type == 'ctb':
|
||||||
tdSql.execute(f'''insert into {tbname}_{i} values({self.ts},"{base_data['binary']}")''')
|
if 'binary' in column_type.lower():
|
||||||
elif 'nchar' in column_type.lower():
|
tdSql.execute(f'''insert into {tbname} values({self.ts},"{base_data['binary']}")''')
|
||||||
tdSql.execute(f'''insert into {tbname}_{i} values({self.ts},"{base_data['nchar']}")''')
|
elif 'nchar' in column_type.lower():
|
||||||
else:
|
tdSql.execute(f'''insert into {tbname} values({self.ts},"{base_data['nchar']}")''')
|
||||||
tdSql.execute(f'insert into {tbname}_{i} values({self.ts},{base_data[column_type]})')
|
else:
|
||||||
tdSql.query(f'select {column_name} from {tbname} where ts={self.ts}')
|
tdSql.execute(f'insert into {tbname} values({self.ts},{base_data[column_type]})')
|
||||||
if column_type.lower() == 'float' or column_type.lower() == 'double':
|
elif tb_type == 'stb':
|
||||||
if abs(tdSql.queryResult[0][0] - base_data[column_type]) / base_data[column_type] <= 0.0001:
|
for i in range(tb_num):
|
||||||
tdSql.checkEqual(tdSql.queryResult[0][0],tdSql.queryResult[0][0])
|
if 'binary' in column_type.lower():
|
||||||
else:
|
tdSql.execute(f'''insert into {tbname}_{i} values({self.ts},"{base_data['binary']}")''')
|
||||||
tdLog.exit(f'{column_type} data check failure')
|
elif 'nchar' in column_type.lower():
|
||||||
elif 'binary' in column_type.lower():
|
tdSql.execute(f'''insert into {tbname}_{i} values({self.ts},"{base_data['nchar']}")''')
|
||||||
tdSql.checkEqual(tdSql.queryResult[0][0],base_data['binary'])
|
else:
|
||||||
elif 'nchar' in column_type.lower():
|
tdSql.execute(f'insert into {tbname}_{i} values({self.ts},{base_data[column_type]})')
|
||||||
tdSql.checkEqual(tdSql.queryResult[0][0],base_data['nchar'])
|
tdSql.query(f'select {column_name} from {tbname} where ts={self.ts}')
|
||||||
else:
|
if column_type.lower() == 'float' or column_type.lower() == 'double':
|
||||||
tdSql.checkEqual(tdSql.queryResult[0][0],base_data[column_type])
|
if abs(tdSql.queryResult[0][0] - base_data[column_type]) / base_data[column_type] <= 0.0001:
|
||||||
def delete_rows(self,dbname,tbname,col_name,col_type,base_data,row_num,tb_type,tb_num=1):
|
tdSql.checkEqual(tdSql.queryResult[0][0],tdSql.queryResult[0][0])
|
||||||
for i in range(row_num):
|
else:
|
||||||
tdSql.execute(f'delete from {tbname} where ts>{self.ts+i}')
|
tdLog.exit(f'{column_type} data check failure')
|
||||||
tdSql.execute(f'flush database {dbname}')
|
elif 'binary' in column_type.lower():
|
||||||
tdSql.execute('reset query cache')
|
tdSql.checkEqual(tdSql.queryResult[0][0],base_data['binary'])
|
||||||
tdSql.query(f'select {col_name} from {tbname}')
|
elif 'nchar' in column_type.lower():
|
||||||
if tb_type == 'ntb' or tb_type == 'ctb':
|
tdSql.checkEqual(tdSql.queryResult[0][0],base_data['nchar'])
|
||||||
tdSql.checkRows(i+1)
|
else:
|
||||||
self.insert_base_data(col_type,tbname,row_num,base_data)
|
tdSql.checkEqual(tdSql.queryResult[0][0],base_data[column_type])
|
||||||
elif tb_type == 'stb':
|
def delete_rows(self,dbname,tbname,col_name,col_type,base_data,row_num,tb_type,tb_num=1):
|
||||||
tdSql.checkRows((i+1)*tb_num)
|
for i in range(row_num):
|
||||||
for j in range(tb_num):
|
tdSql.execute(f'delete from {tbname} where ts>{self.ts+i}')
|
||||||
self.insert_base_data(col_type,f'{tbname}_{j}',row_num,base_data)
|
tdSql.execute(f'flush database {dbname}')
|
||||||
for i in range(row_num):
|
tdSql.execute('reset query cache')
|
||||||
tdSql.execute(f'delete from {tbname} where ts>={self.ts+i}')
|
tdSql.query(f'select {col_name} from {tbname}')
|
||||||
tdSql.execute(f'flush database {dbname}')
|
if tb_type == 'ntb' or tb_type == 'ctb':
|
||||||
tdSql.execute('reset query cache')
|
tdSql.checkRows(i+1)
|
||||||
tdSql.query(f'select {col_name} from {tbname}')
|
self.insert_base_data(col_type,tbname,row_num,base_data)
|
||||||
if tb_type == 'ntb' or tb_type == 'ctb':
|
elif tb_type == 'stb':
|
||||||
tdSql.checkRows(i)
|
tdSql.checkRows((i+1)*tb_num)
|
||||||
self.insert_base_data(col_type,tbname,row_num,base_data)
|
for j in range(tb_num):
|
||||||
elif tb_type == 'stb':
|
self.insert_base_data(col_type,f'{tbname}_{j}',row_num,base_data)
|
||||||
tdSql.checkRows(i*tb_num)
|
for i in range(row_num):
|
||||||
for j in range(tb_num):
|
tdSql.execute(f'delete from {tbname} where ts>={self.ts+i}')
|
||||||
self.insert_base_data(col_type,f'{tbname}_{j}',row_num,base_data)
|
tdSql.execute(f'flush database {dbname}')
|
||||||
for i in range(row_num):
|
tdSql.execute('reset query cache')
|
||||||
tdSql.execute(f'delete from {tbname} where ts<={self.ts+i}')
|
tdSql.query(f'select {col_name} from {tbname}')
|
||||||
tdSql.execute(f'flush database {dbname}')
|
if tb_type == 'ntb' or tb_type == 'ctb':
|
||||||
tdSql.execute('reset query cache')
|
tdSql.checkRows(i)
|
||||||
tdSql.query(f'select {col_name} from {tbname}')
|
self.insert_base_data(col_type,tbname,row_num,base_data)
|
||||||
if tb_type == 'ntb' or tb_type == 'ctb':
|
elif tb_type == 'stb':
|
||||||
tdSql.checkRows(row_num-i-1)
|
tdSql.checkRows(i*tb_num)
|
||||||
self.insert_base_data(col_type,tbname,row_num,base_data)
|
for j in range(tb_num):
|
||||||
elif tb_type == 'stb':
|
self.insert_base_data(col_type,f'{tbname}_{j}',row_num,base_data)
|
||||||
tdSql.checkRows((row_num-i-1)*tb_num)
|
for i in range(row_num):
|
||||||
for j in range(tb_num):
|
tdSql.execute(f'delete from {tbname} where ts<={self.ts+i}')
|
||||||
self.insert_base_data(col_type,f'{tbname}_{j}',row_num,base_data)
|
tdSql.execute(f'flush database {dbname}')
|
||||||
for i in range(row_num):
|
tdSql.execute('reset query cache')
|
||||||
tdSql.execute(f'delete from {tbname} where ts<{self.ts+i}')
|
tdSql.query(f'select {col_name} from {tbname}')
|
||||||
tdSql.execute(f'flush database {dbname}')
|
if tb_type == 'ntb' or tb_type == 'ctb':
|
||||||
tdSql.execute('reset query cache')
|
tdSql.checkRows(row_num-i-1)
|
||||||
tdSql.query(f'select {col_name} from {tbname}')
|
self.insert_base_data(col_type,tbname,row_num,base_data)
|
||||||
if tb_type == 'ntb' or tb_type == 'ctb':
|
elif tb_type == 'stb':
|
||||||
tdSql.checkRows(row_num-i)
|
tdSql.checkRows((row_num-i-1)*tb_num)
|
||||||
self.insert_base_data(col_type,tbname,row_num,base_data)
|
for j in range(tb_num):
|
||||||
elif tb_type == 'stb':
|
self.insert_base_data(col_type,f'{tbname}_{j}',row_num,base_data)
|
||||||
tdSql.checkRows((row_num-i)*tb_num)
|
for i in range(row_num):
|
||||||
for j in range(tb_num):
|
tdSql.execute(f'delete from {tbname} where ts<{self.ts+i}')
|
||||||
self.insert_base_data(col_type,f'{tbname}_{j}',row_num,base_data)
|
tdSql.execute(f'flush database {dbname}')
|
||||||
for i in range(row_num):
|
tdSql.execute('reset query cache')
|
||||||
tdSql.execute(f'delete from {tbname} where ts between {self.ts} and {self.ts+i}')
|
tdSql.query(f'select {col_name} from {tbname}')
|
||||||
tdSql.execute(f'flush database {dbname}')
|
if tb_type == 'ntb' or tb_type == 'ctb':
|
||||||
tdSql.execute('reset query cache')
|
tdSql.checkRows(row_num-i)
|
||||||
tdSql.query(f'select {col_name} from {tbname}')
|
self.insert_base_data(col_type,tbname,row_num,base_data)
|
||||||
if tb_type == 'ntb' or tb_type == 'ctb':
|
elif tb_type == 'stb':
|
||||||
tdSql.checkRows(row_num - i-1)
|
tdSql.checkRows((row_num-i)*tb_num)
|
||||||
self.insert_base_data(col_type,tbname,row_num,base_data)
|
for j in range(tb_num):
|
||||||
elif tb_type == 'stb':
|
self.insert_base_data(col_type,f'{tbname}_{j}',row_num,base_data)
|
||||||
tdSql.checkRows(tb_num*(row_num - i-1))
|
for i in range(row_num):
|
||||||
for j in range(tb_num):
|
tdSql.execute(f'delete from {tbname} where ts between {self.ts} and {self.ts+i}')
|
||||||
self.insert_base_data(col_type,f'{tbname}_{j}',row_num,base_data)
|
tdSql.execute(f'flush database {dbname}')
|
||||||
tdSql.execute(f'delete from {tbname} where ts between {self.ts+i+1} and {self.ts}')
|
tdSql.execute('reset query cache')
|
||||||
tdSql.query(f'select {col_name} from {tbname}')
|
tdSql.query(f'select {col_name} from {tbname}')
|
||||||
if tb_type == 'ntb' or tb_type == 'ctb':
|
if tb_type == 'ntb' or tb_type == 'ctb':
|
||||||
tdSql.checkRows(row_num)
|
tdSql.checkRows(row_num - i-1)
|
||||||
elif tb_type == 'stb':
|
self.insert_base_data(col_type,tbname,row_num,base_data)
|
||||||
tdSql.checkRows(tb_num*row_num)
|
elif tb_type == 'stb':
|
||||||
def delete_error(self,tbname,column_name,column_type,base_data):
|
tdSql.checkRows(tb_num*(row_num - i-1))
|
||||||
for error_list in ['',f'ts = {self.ts} and',f'ts = {self.ts} or']:
|
for j in range(tb_num):
|
||||||
if 'binary' in column_type.lower():
|
self.insert_base_data(col_type,f'{tbname}_{j}',row_num,base_data)
|
||||||
tdSql.error(f'''delete from {tbname} where {error_list} {column_name} ="{base_data['binary']}"''')
|
tdSql.execute(f'delete from {tbname} where ts between {self.ts+i+1} and {self.ts}')
|
||||||
elif 'nchar' in column_type.lower():
|
tdSql.query(f'select {col_name} from {tbname}')
|
||||||
tdSql.error(f'''delete from {tbname} where {error_list} {column_name} ="{base_data['nchar']}"''')
|
if tb_type == 'ntb' or tb_type == 'ctb':
|
||||||
else:
|
tdSql.checkRows(row_num)
|
||||||
tdSql.error(f'delete from {tbname} where {error_list} {column_name} = {base_data[column_type]}')
|
elif tb_type == 'stb':
|
||||||
|
tdSql.checkRows(tb_num*row_num)
|
||||||
def delete_data_ntb(self):
|
def delete_error(self,tbname,column_name,column_type,base_data):
|
||||||
tdSql.execute(f'create database if not exists {self.dbname}')
|
for error_list in ['',f'ts = {self.ts} and',f'ts = {self.ts} or']:
|
||||||
tdSql.execute(f'use {self.dbname}')
|
if 'binary' in column_type.lower():
|
||||||
for col_name,col_type in self.column_dict.items():
|
tdSql.error(f'''delete from {tbname} where {error_list} {column_name} ="{base_data['binary']}"''')
|
||||||
tdSql.execute(f'create table {self.ntbname} (ts timestamp,{col_name} {col_type})')
|
elif 'nchar' in column_type.lower():
|
||||||
self.insert_base_data(col_type,self.ntbname,self.rowNum,self.base_data)
|
tdSql.error(f'''delete from {tbname} where {error_list} {column_name} ="{base_data['nchar']}"''')
|
||||||
self.delete_one_row(self.ntbname,col_type,col_name,self.base_data,self.rowNum,self.dbname,'ntb')
|
else:
|
||||||
self.delete_all_data(self.ntbname,col_type,self.rowNum,self.base_data,self.dbname,'ntb')
|
tdSql.error(f'delete from {tbname} where {error_list} {column_name} = {base_data[column_type]}')
|
||||||
self.delete_error(self.ntbname,col_name,col_type,self.base_data)
|
|
||||||
self.delete_rows(self.dbname,self.ntbname,col_name,col_type,self.base_data,self.rowNum,'ntb')
|
def delete_data_ntb(self):
|
||||||
for func in ['first','last']:
|
tdSql.execute(f'create database if not exists {self.dbname}')
|
||||||
tdSql.query(f'select {func}(*) from {self.ntbname}')
|
tdSql.execute(f'use {self.dbname}')
|
||||||
tdSql.execute(f'drop table {self.ntbname}')
|
for col_name,col_type in self.column_dict.items():
|
||||||
tdSql.execute(f'drop database {self.dbname}')
|
tdSql.execute(f'create table {self.ntbname} (ts timestamp,{col_name} {col_type})')
|
||||||
def delete_data_ctb(self):
|
self.insert_base_data(col_type,self.ntbname,self.rowNum,self.base_data)
|
||||||
tdSql.execute(f'create database if not exists {self.dbname}')
|
self.delete_one_row(self.ntbname,col_type,col_name,self.base_data,self.rowNum,self.dbname,'ntb')
|
||||||
tdSql.execute(f'use {self.dbname}')
|
self.delete_all_data(self.ntbname,col_type,self.rowNum,self.base_data,self.dbname,'ntb')
|
||||||
for col_name,col_type in self.column_dict.items():
|
self.delete_error(self.ntbname,col_name,col_type,self.base_data)
|
||||||
tdSql.execute(f'create table {self.stbname} (ts timestamp,{col_name} {col_type}) tags(t1 int)')
|
self.delete_rows(self.dbname,self.ntbname,col_name,col_type,self.base_data,self.rowNum,'ntb')
|
||||||
for i in range(self.tbnum):
|
for func in ['first','last']:
|
||||||
tdSql.execute(f'create table {self.stbname}_{i} using {self.stbname} tags(1)')
|
tdSql.query(f'select {func}(*) from {self.ntbname}')
|
||||||
self.insert_base_data(col_type,f'{self.stbname}_{i}',self.rowNum,self.base_data)
|
tdSql.execute(f'drop table {self.ntbname}')
|
||||||
self.delete_one_row(f'{self.stbname}_{i}',col_type,col_name,self.base_data,self.rowNum,self.dbname,'ctb')
|
tdSql.execute(f'drop database {self.dbname}')
|
||||||
self.delete_all_data(f'{self.stbname}_{i}',col_type,self.rowNum,self.base_data,self.dbname,'ctb')
|
def delete_data_ctb(self):
|
||||||
self.delete_error(f'{self.stbname}_{i}',col_name,col_type,self.base_data)
|
tdSql.execute(f'create database if not exists {self.dbname}')
|
||||||
self.delete_rows(self.dbname,f'{self.stbname}_{i}',col_name,col_type,self.base_data,self.rowNum,'ctb')
|
tdSql.execute(f'use {self.dbname}')
|
||||||
for func in ['first','last']:
|
for col_name,col_type in self.column_dict.items():
|
||||||
tdSql.query(f'select {func}(*) from {self.stbname}_{i}')
|
tdSql.execute(f'create table {self.stbname} (ts timestamp,{col_name} {col_type}) tags(t1 int)')
|
||||||
tdSql.execute(f'drop table {self.stbname}')
|
for i in range(self.tbnum):
|
||||||
def delete_data_stb(self):
|
tdSql.execute(f'create table {self.stbname}_{i} using {self.stbname} tags(1)')
|
||||||
tdSql.execute(f'create database if not exists {self.dbname}')
|
self.insert_base_data(col_type,f'{self.stbname}_{i}',self.rowNum,self.base_data)
|
||||||
tdSql.execute(f'use {self.dbname}')
|
self.delete_one_row(f'{self.stbname}_{i}',col_type,col_name,self.base_data,self.rowNum,self.dbname,'ctb')
|
||||||
for col_name,col_type in self.column_dict.items():
|
self.delete_all_data(f'{self.stbname}_{i}',col_type,self.rowNum,self.base_data,self.dbname,'ctb',i+1,self.stbname)
|
||||||
tdSql.execute(f'create table {self.stbname} (ts timestamp,{col_name} {col_type}) tags(t1 int)')
|
self.delete_error(f'{self.stbname}_{i}',col_name,col_type,self.base_data)
|
||||||
for i in range(self.tbnum):
|
self.delete_rows(self.dbname,f'{self.stbname}_{i}',col_name,col_type,self.base_data,self.rowNum,'ctb')
|
||||||
tdSql.execute(f'create table {self.stbname}_{i} using {self.stbname} tags(1)')
|
for func in ['first','last']:
|
||||||
self.insert_base_data(col_type,f'{self.stbname}_{i}',self.rowNum,self.base_data)
|
tdSql.query(f'select {func}(*) from {self.stbname}_{i}')
|
||||||
self.delete_error(self.stbname,col_name,col_type,self.base_data)
|
tdSql.execute(f'drop table {self.stbname}')
|
||||||
self.delete_one_row(self.stbname,col_type,col_name,self.base_data,self.rowNum,self.dbname,'stb',self.tbnum)
|
def delete_data_stb(self):
|
||||||
self.delete_all_data(self.stbname,col_type,self.rowNum,self.base_data,self.dbname,'stb',self.tbnum)
|
tdSql.execute(f'create database if not exists {self.dbname}')
|
||||||
self.delete_rows(self.dbname,self.stbname,col_name,col_type,self.base_data,self.rowNum,'stb',self.tbnum)
|
tdSql.execute(f'use {self.dbname}')
|
||||||
for func in ['first','last']:
|
for col_name,col_type in self.column_dict.items():
|
||||||
tdSql.query(f'select {func}(*) from {self.stbname}')
|
tdSql.execute(f'create table {self.stbname} (ts timestamp,{col_name} {col_type}) tags(t1 int)')
|
||||||
tdSql.execute(f'drop table {self.stbname}')
|
for i in range(self.tbnum):
|
||||||
tdSql.execute(f'drop database {self.dbname}')
|
tdSql.execute(f'create table {self.stbname}_{i} using {self.stbname} tags(1)')
|
||||||
def run(self):
|
self.insert_base_data(col_type,f'{self.stbname}_{i}',self.rowNum,self.base_data)
|
||||||
self.delete_data_ntb()
|
self.delete_error(self.stbname,col_name,col_type,self.base_data)
|
||||||
self.delete_data_ctb()
|
self.delete_one_row(self.stbname,col_type,col_name,self.base_data,self.rowNum,self.dbname,'stb',self.tbnum)
|
||||||
self.delete_data_stb()
|
self.delete_all_data(self.stbname,col_type,self.rowNum,self.base_data,self.dbname,'stb',self.tbnum)
|
||||||
tdDnodes.stoptaosd(1)
|
self.delete_rows(self.dbname,self.stbname,col_name,col_type,self.base_data,self.rowNum,'stb',self.tbnum)
|
||||||
tdDnodes.starttaosd(1)
|
for func in ['first','last']:
|
||||||
self.delete_data_ntb()
|
tdSql.query(f'select {func}(*) from {self.stbname}')
|
||||||
def stop(self):
|
tdSql.execute(f'drop table {self.stbname}')
|
||||||
tdSql.close()
|
tdSql.execute(f'drop database {self.dbname}')
|
||||||
tdLog.success("%s successfully executed" % __file__)
|
def run(self):
|
||||||
|
self.delete_data_ntb()
|
||||||
tdCases.addWindows(__file__, TDTestCase())
|
self.delete_data_ctb()
|
||||||
tdCases.addLinux(__file__, TDTestCase())
|
self.delete_data_stb()
|
||||||
|
tdDnodes.stoptaosd(1)
|
||||||
|
tdDnodes.starttaosd(1)
|
||||||
|
self.delete_data_ntb()
|
||||||
|
def stop(self):
|
||||||
|
tdSql.close()
|
||||||
|
tdLog.success("%s successfully executed" % __file__)
|
||||||
|
|
||||||
|
tdCases.addWindows(__file__, TDTestCase())
|
||||||
|
tdCases.addLinux(__file__, TDTestCase())
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue