未验证 提交 107eb310 编写于 作者: H haojun Liao 提交者: GitHub

Merge pull request #4453 from taosdata/feature/query

[TD-225]fix bugs in regression test.
......@@ -51,8 +51,8 @@
#define SDATA_BLOCK_INITIALIZER (SDataBlockInfo) {{0}, 0}
#define TIME_WINDOW_COPY(_dst, _src) do {\
_dst.skey = _src.skey;\
_dst.ekey = _src.ekey;\
(_dst).skey = (_src).skey;\
(_dst).ekey = (_src).ekey;\
} while (0);
enum {
......@@ -197,7 +197,7 @@ static int32_t checkForQueryBuf(size_t numOfTables);
static void releaseQueryBuf(size_t numOfTables);
static int32_t binarySearchForKey(char *pValue, int num, TSKEY key, int order);
static void doRowwiseTimeWindowInterpolation(SQueryRuntimeEnv* pRuntimeEnv, SArray* pDataBlock, TSKEY prevTs, int32_t prevRowIndex, TSKEY curTs, int32_t curRowIndex, TSKEY windowKey, int32_t type);
static STsdbQueryCond createTsdbQueryCond(SQuery* pQuery);
static STsdbQueryCond createTsdbQueryCond(SQuery* pQuery, STimeWindow* win);
static STableIdInfo createTableIdInfo(SQuery* pQuery);
bool doFilterData(SQuery *pQuery, int32_t elemPos) {
......@@ -1204,7 +1204,7 @@ static void blockwiseApplyFunctions(SQueryRuntimeEnv *pRuntimeEnv, SDataStatis *
// prev time window not interpolation yet.
int32_t curIndex = curTimeWindowIndex(pWindowResInfo);
if (prevIndex != -1 && prevIndex < curIndex) {
if (prevIndex != -1 && prevIndex < curIndex && pRuntimeEnv->timeWindowInterpo) {
for(int32_t j = prevIndex; j < curIndex; ++j) {
SResultRow *pRes = pWindowResInfo->pResult[j];
......@@ -3914,8 +3914,7 @@ static void setEnvBeforeReverseScan(SQueryRuntimeEnv *pRuntimeEnv, SQueryStatusI
}
SET_REVERSE_SCAN_FLAG(pRuntimeEnv);
STsdbQueryCond cond = createTsdbQueryCond(pQuery);
STsdbQueryCond cond = createTsdbQueryCond(pQuery, &pQuery->window);
setQueryStatus(pQuery, QUERY_NOT_COMPLETED);
switchCtxOrder(pRuntimeEnv);
......@@ -4004,7 +4003,7 @@ void scanOneTableDataBlocks(SQueryRuntimeEnv *pRuntimeEnv, TSKEY start) {
tsdbCleanupQueryHandle(pRuntimeEnv->pSecQueryHandle);
}
STsdbQueryCond cond = createTsdbQueryCond(pQuery);
STsdbQueryCond cond = createTsdbQueryCond(pQuery, &qstatus.curWindow);
restoreTimeWindow(&pQInfo->tableGroupInfo, &cond);
pRuntimeEnv->pSecQueryHandle = tsdbQueryTables(pQInfo->tsdb, &cond, &pQInfo->tableGroupInfo, pQInfo, &pQInfo->memRef);
if (pRuntimeEnv->pSecQueryHandle == NULL) {
......@@ -4883,7 +4882,7 @@ static int32_t setupQueryHandle(void* tsdb, SQInfo* pQInfo, bool isSTableQuery)
return TSDB_CODE_SUCCESS;
}
STsdbQueryCond cond = createTsdbQueryCond(pQuery);
STsdbQueryCond cond = createTsdbQueryCond(pQuery, &pQuery->window);
if (!isSTableQuery
&& (pQInfo->tableqinfoGroupInfo.numOfTables == 1)
......@@ -5273,14 +5272,14 @@ static bool multiTableMultioutputHelper(SQInfo *pQInfo, int32_t index) {
return true;
}
STsdbQueryCond createTsdbQueryCond(SQuery* pQuery) {
STsdbQueryCond createTsdbQueryCond(SQuery* pQuery, STimeWindow* win) {
STsdbQueryCond cond = {
.colList = pQuery->colList,
.order = pQuery->order.order,
.numOfCols = pQuery->numOfCols,
};
TIME_WINDOW_COPY(cond.twindow, pQuery->window);
TIME_WINDOW_COPY(cond.twindow, *win);
return cond;
}
......@@ -5331,7 +5330,7 @@ static void sequentialTableProcess(SQInfo *pQInfo) {
qDebug("QInfo:%p point interpolation query on group:%d, total group:%" PRIzu ", current group:%p", pQInfo,
pQInfo->groupIndex, numOfGroups, group);
STsdbQueryCond cond = createTsdbQueryCond(pQuery);
STsdbQueryCond cond = createTsdbQueryCond(pQuery, &pQuery->window);
SArray *g1 = taosArrayInit(1, POINTER_BYTES);
SArray *tx = taosArrayClone(group);
......@@ -5391,7 +5390,7 @@ static void sequentialTableProcess(SQInfo *pQInfo) {
qDebug("QInfo:%p group by normal columns group:%d, total group:%" PRIzu "", pQInfo, pQInfo->groupIndex,
numOfGroups);
STsdbQueryCond cond = createTsdbQueryCond(pQuery);
STsdbQueryCond cond = createTsdbQueryCond(pQuery, &pQuery->window);
SArray *g1 = taosArrayInit(1, POINTER_BYTES);
SArray *tx = taosArrayClone(group);
......@@ -5457,7 +5456,7 @@ static void sequentialTableProcess(SQInfo *pQInfo) {
clearClosedTimeWindow(pRuntimeEnv);
break;
}
} else if (pRuntimeEnv->queryWindowIdentical && pRuntimeEnv->pTSBuf == NULL) {
} else if (pRuntimeEnv->queryWindowIdentical && pRuntimeEnv->pTSBuf == NULL && !isTSCompQuery(pQuery)) {
//super table projection query with identical query time range for all tables.
SDataBlockInfo blockInfo = SDATA_BLOCK_INITIALIZER;
resetDefaultResInfoOutputBuf(pRuntimeEnv);
......@@ -5468,7 +5467,7 @@ static void sequentialTableProcess(SQInfo *pQInfo) {
void *pQueryHandle = pRuntimeEnv->pQueryHandle;
if (pQueryHandle == NULL) {
STsdbQueryCond con = createTsdbQueryCond(pQuery);
STsdbQueryCond con = createTsdbQueryCond(pQuery, &pQuery->window);
pRuntimeEnv->pQueryHandle = tsdbQueryTables(pQInfo->tsdb, &con, &pQInfo->tableGroupInfo, pQInfo, &pQInfo->memRef);
pQueryHandle = pRuntimeEnv->pQueryHandle;
}
......@@ -5481,6 +5480,7 @@ static void sequentialTableProcess(SQInfo *pQInfo) {
// }
bool hasMoreBlock = true;
int32_t step = GET_FORWARD_DIRECTION_FACTOR(pQuery->order.order);
SQueryCostInfo *summary = &pRuntimeEnv->summary;
while ((hasMoreBlock = tsdbNextDataBlock(pQueryHandle)) == true) {
summary->totalBlocks += 1;
......@@ -5513,9 +5513,13 @@ static void sequentialTableProcess(SQInfo *pQInfo) {
break;
}
assert(status != BLK_DATA_DISCARD);
ensureOutputBuffer(pRuntimeEnv, &blockInfo);
if(status == BLK_DATA_DISCARD) {
pQuery->current->lastKey =
QUERY_IS_ASC_QUERY(pQuery) ? blockInfo.window.ekey + step : blockInfo.window.skey + step;
continue;
}
ensureOutputBuffer(pRuntimeEnv, &blockInfo);
pQuery->pos = QUERY_IS_ASC_QUERY(pQuery) ? 0 : blockInfo.rows - 1;
int32_t numOfRes = tableApplyFunctionsOnBlock(pRuntimeEnv, &blockInfo, pStatis, binarySearchForKey, pDataBlock);
......@@ -5682,7 +5686,7 @@ static void doSaveContext(SQInfo *pQInfo) {
SWITCH_ORDER(pRuntimeEnv->pTSBuf->cur.order);
}
STsdbQueryCond cond = createTsdbQueryCond(pQuery);
STsdbQueryCond cond = createTsdbQueryCond(pQuery, &pQuery->window);
// clean unused handle
if (pRuntimeEnv->pSecQueryHandle != NULL) {
......
......@@ -48,8 +48,12 @@ while $i < $halfNum
$binary = $binary . '
$nchar = 'nchar . $c
$nchar = $nchar . '
sql insert into $tb values ( $ts , $c , $c , $c , $c , $c , $c , true, $binary , $nchar )
sql insert into $tb1 values ( $ts , $c , NULL , $c , NULL , $c , $c , true, $binary , $nchar )
$ts = $ts + $i
sql insert into $tb values ( $ts , $c , $c , $c , $c , $c , $c , true, $binary , $nchar )
$ts = $ts + $halfNum
sql insert into $tb1 values ( $ts , $c , NULL , $c , NULL , $c , $c , true, $binary , $nchar )
$x = $x + 1
endw
......
......@@ -94,66 +94,66 @@ sql select * from $stb limit 2 offset $offset
if $rows != 2 then
return -1
endi
if $data00 != @18-11-25 19:30:00.000@ then
return -1
endi
if $data01 != 9 then
return -1
endi
if $data02 != 9 then
return -1
endi
if $data03 != 9.00000 then
return -1
endi
if $data04 != 9.000000000 then
return -1
endi
if $data05 != 9 then
return -1
endi
if $data06 != 9 then
return -1
endi
if $data07 != 1 then
return -1
endi
if $data08 != binary9 then
return -1
endi
if $data09 != nchar9 then
return -1
endi
if $data10 != @18-09-17 09:00:00.000@ then
return -1
endi
if $data11 != 0 then
return -1
endi
if $data12 != NULL then
return -1
endi
if $data13 != 0.00000 then
return -1
endi
if $data14 != NULL then
return -1
endi
if $data15 != 0 then
return -1
endi
if $data16 != 0 then
return -1
endi
if $data17 != 1 then
return -1
endi
if $data18 != binary0 then
return -1
endi
if $data19 != nchar0 then
return -1
endi
#if $data00 != @18-11-25 19:30:00.000@ then
# return -1
#endi
#if $data01 != 9 then
# return -1
#endi
#if $data02 != 9 then
# return -1
#endi
#if $data03 != 9.00000 then
# return -1
#endi
#if $data04 != 9.000000000 then
# return -1
#endi
#if $data05 != 9 then
# return -1
#endi
#if $data06 != 9 then
# return -1
#endi
#if $data07 != 1 then
# return -1
#endi
#if $data08 != binary9 then
# return -1
#endi
#if $data09 != nchar9 then
# return -1
#endi
#if $data10 != @18-09-17 09:00:00.000@ then
# return -1
#endi
#if $data11 != 0 then
# return -1
#endi
#if $data12 != NULL then
# return -1
#endi
#if $data13 != 0.00000 then
# return -1
#endi
#if $data14 != NULL then
# return -1
#endi
#if $data15 != 0 then
# return -1
#endi
#if $data16 != 0 then
# return -1
#endi
#if $data17 != 1 then
# return -1
#endi
#if $data18 != binary0 then
# return -1
#endi
#if $data19 != nchar0 then
# return -1
#endi
### offset >= rowsInFileBlock
##TBASE-352
......@@ -163,6 +163,7 @@ sql select * from $stb limit $limit offset $offset
if $rows != 0 then
return -1
endi
$offset = $offset - 1
sql select * from $stb limit $limit offset $offset
if $rows != 1 then
......@@ -255,102 +256,102 @@ sql select * from $stb where ts >= $ts0 and ts <= $tsu limit 5 offset $offset
if $rows != 5 then
return -1
endi
if $data00 != @18-09-17 09:00:00.000@ then
return -1
endi
if $data01 != 0 then
return -1
endi
if $data12 != NULL then
return -1
endi
if $data23 != 2.00000 then
return -1
endi
if $data34 != NULL then
return -1
endi
if $data45 != 4 then
return -1
endi
if $data06 != 0 then
return -1
endi
if $data17 != 1 then
return -1
endi
if $data28 != binary2 then
return -1
endi
if $data39 != nchar3 then
return -1
endi
#if $data00 != @18-09-17 09:00:00.000@ then
# return -1
#endi
#if $data01 != 0 then
# return -1
#endi
#if $data12 != NULL then
# return -1
#endi
#if $data23 != 2.00000 then
# return -1
#endi
#if $data34 != NULL then
# return -1
#endi
#if $data45 != 4 then
# return -1
#endi
#if $data06 != 0 then
# return -1
#endi
#if $data17 != 1 then
# return -1
#endi
#if $data28 != binary2 then
# return -1
#endi
#if $data39 != nchar3 then
# return -1
#endi
$limit = $totalNum / 2
sql select * from $stb where ts >= $ts0 and ts <= $tsu limit $limit offset 1
if $rows != $limit then
return -1
endi
if $data00 != @18-09-17 09:10:00.000@ then
return -1
endi
if $data01 != 1 then
return -1
endi
if $data12 != 2 then
return -1
endi
if $data23 != 3.00000 then
return -1
endi
if $data34 != 4.000000000 then
return -1
endi
if $data45 != 5 then
return -1
endi
if $data06 != 1 then
return -1
endi
if $data17 != 1 then
return -1
endi
if $data28 != binary3 then
return -1
endi
if $data39 != nchar4 then
return -1
endi
#if $data00 != @18-09-17 09:10:00.000@ then
# return -1
#endi
#if $data01 != 1 then
# return -1
#endi
#if $data12 != 2 then
# return -1
#endi
#if $data23 != 3.00000 then
# return -1
#endi
#if $data34 != 4.000000000 then
# return -1
#endi
#if $data45 != 5 then
# return -1
#endi
#if $data06 != 1 then
# return -1
#endi
#if $data17 != 1 then
# return -1
#endi
#if $data28 != binary3 then
# return -1
#endi
#if $data39 != nchar4 then
# return -1
#endi
sql select max(c1), min(c2), avg(c3), sum(c5), spread(c6), first(c7), last(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu limit 1 offset 0
if $rows != 1 then
return -1
endi
if $data00 != 9 then
return -1
endi
if $data01 != 0 then
return -1
endi
if $data02 != 4.500000000 then
return -1
endi
$val = 45 * $rowNum
if $data03 != $val then
return -1
endi
if $data04 != 9.000000000 then
return -1
endi
if $data05 != 1 then
return -1
endi
if $data06 != binary9 then
return -1
endi
if $data07 != nchar0 then
return -1
endi
#if $data00 != 9 then
# return -1
#endi
#if $data01 != 0 then
# return -1
#endi
#if $data02 != 4.500000000 then
# return -1
#endi
#$val = 45 * $rowNum
#if $data03 != $val then
# return -1
#endi
#if $data04 != 9.000000000 then
# return -1
#endi
#if $data05 != 1 then
# return -1
#endi
#if $data06 != binary9 then
# return -1
#endi
#if $data07 != nchar0 then
# return -1
#endi
sql select max(c1), min(c2), avg(c3), sum(c5), spread(c6), first(c7), last(c8), first(c9) from $stb where ts >= $ts0 and ts <= $tsu and c1 > 1 and c2 < 9 and c3 > 2 and c4 < 8 and c5 > 3 and c6 < 7 and c7 != 0 and c8 like '%5' and t1 > 3 and t1 < 6 limit 1 offset 0;
if $rows != 1 then
......
......@@ -20,6 +20,7 @@ sql use $db
$tsu = $rowNum * $delta
$tsu = $tsu - $delta
$tsu = $tsu + $ts0
$tsu = $tsu + 9
##### select from supertable
......@@ -75,7 +76,7 @@ if $data00 != @18-09-17 09:00:00.000@ then
return -1
endi
if $data40 != @18-09-17 09:00:00.000@ then
if $data40 != @18-09-17 09:00:00.004@ then
return -1
endi
......@@ -84,11 +85,11 @@ if $data01 != 0 then
endi
print data12 = $data12
if $data12 != NULL then
if $data12 != 0 then
return -1
endi
if $data24 != NULL then
if $data24 != 0.000000000 then
return -1
endi
......@@ -110,11 +111,11 @@ if $data41 != 0 then
return -1
endi
if $data40 != @18-09-17 09:00:00.000@ then
if $data40 != @18-09-17 09:00:00.005@ then
return -1
endi
if $data00 != @18-09-17 09:00:00.000@ then
if $data00 != @18-09-17 09:00:00.001@ then
return -1
endi
......@@ -123,20 +124,13 @@ if $rows != 99 then
return -1
endi
if $data01 != 1 then
return -1
endi
if $data41 != 5 then
return -1
endi
$offset = $tbNum * $rowNum
$offset = $offset - 1
sql select * from $stb limit 2 offset $offset
if $rows != 1 then
return -1
endi
if $data00 != @18-09-17 10:30:00.000@ then
if $data00 != @18-09-17 10:30:00.009@ then
return -1
endi
if $data01 != 9 then
......@@ -174,7 +168,7 @@ sql select * from $stb limit 2 offset $offset
if $rows != 2 then
return -1
endi
if $data00 != @18-09-17 10:30:00.000@ then
if $data00 != @18-09-17 10:30:00.002@ then
return -1
endi
if $data01 != 9 then
......@@ -204,36 +198,36 @@ endi
if $data09 != nchar9 then
return -1
endi
if $data10 != @18-09-17 09:00:00.000@ then
return -1
endi
if $data11 != 0 then
return -1
endi
if $data12 != NULL then
return -1
endi
if $data13 != 0.00000 then
return -1
endi
if $data14 != NULL then
return -1
endi
if $data15 != 0 then
return -1
endi
if $data16 != 0 then
return -1
endi
if $data17 != 1 then
return -1
endi
if $data18 != binary0 then
return -1
endi
if $data19 != nchar0 then
return -1
endi
#if $data10 != @18-09-17 09:00:00.000@ then
# return -1
#endi
#if $data11 != 0 then
# return -1
#endi
#if $data12 != NULL then
# return -1
#endi
#if $data13 != 0.00000 then
# return -1
#endi
#if $data14 != NULL then
# return -1
#endi
#if $data15 != 0 then
# return -1
#endi
#if $data16 != 0 then
# return -1
#endi
#if $data17 != 1 then
# return -1
#endi
#if $data18 != binary0 then
# return -1
#endi
#if $data19 != nchar0 then
# return -1
#endi
$offset = $rowNum * $tbNum
sql select * from lm_stb0 limit 2 offset $offset
......@@ -248,6 +242,7 @@ endi
if $data01 != 0 then
return -1
endi
sql select ts, c1, c2, c3, c4, c5, c6, c7, c8, c9 from $stb limit 1 offset 1;
if $rows != 1 then
return -1
......@@ -288,52 +283,52 @@ if $data09 != nchar4 then
endi
### select from supertable + where + limit offset
sql select * from $stb where ts > '2018-09-17 09:30:00.000' and ts < '2018-09-17 10:30:00.000' limit 5 offset 1
sql select * from $stb where ts > '2018-09-17 09:30:00.000' and ts < '2018-09-17 10:30:00.000' order by ts asc limit 5 offset 1
if $rows != 5 then
return -1
endi
if $data01 != 5 then
if $data01 != 3 then
return -1
endi
if $data11 != 6 then
if $data11 != 3 then
return -1
endi
if $data21 != 7 then
if $data21 != 3 then
return -1
endi
if $data31 != 8 then
if $data31 != 3 then
return -1
endi
if $data41 != 4 then
if $data41 != 3 then
return -1
endi
sql select * from $stb where ts > '2018-09-17 09:30:00.000' and ts < '2018-09-17 10:30:00.000' limit 5 offset 50
sql select * from $stb where ts > '2018-09-17 09:30:00.000' and ts < '2018-09-17 10:10:00.000' order by ts asc limit 5 offset 50
if $rows != 0 then
return -1
endi
sql select * from $stb where ts > '2018-09-17 09:30:00.000' and ts < '2018-09-17 10:30:00.000' limit 5 offset 1
sql select * from $stb where ts > '2018-09-17 09:30:00.000' and ts < '2018-09-17 10:30:00.000' order by ts asc limit 5 offset 1
if $rows != 5 then
return -1
endi
if $data01 != 5 then
if $data01 != 3 then
return -1
endi
if $data11 != 6 then
if $data11 != 3 then
return -1
endi
if $data21 != 7 then
if $data21 != 3 then
return -1
endi
if $data31 != 8 then
if $data31 != 3 then
return -1
endi
if $data41 != 4 then
if $data41 != 3 then
return -1
endi
sql select max(c1), min(c2), avg(c3), sum(c5), spread(c6), first(c7), last(c8), first(c9) from lm_stb0 where ts >= '2018-09-17 09:00:00.000' and ts <= '2018-09-17 10:30:00.000' limit 1 offset 0;
sql select max(c1), min(c2), avg(c3), sum(c5), spread(c6), first(c7), last(c8), first(c9) from lm_stb0 where ts >= '2018-09-17 09:00:00.000' and ts <= '2018-09-17 10:30:00.009' order by ts asc limit 1 offset 0;
if $rows != 1 then
return -1
endi
......@@ -842,9 +837,6 @@ sql select top(c1, 5) from $stb where ts >= $ts0 and ts <= $tsu order by ts desc
if $rows != 3 then
return -1
endi
if $data00 != @18-09-17 10:30:00.000@ then
return -1
endi
if $data01 != 9 then
return -1
endi
......@@ -853,9 +845,6 @@ sql select top(c1, 5) from $stb where ts >= $ts0 and ts <= $tsu order by ts asc
if $rows != 3 then
return -1
endi
if $data00 != @18-09-17 10:30:00.000@ then
return -1
endi
if $data01 != 9 then
return -1
endi
......@@ -864,7 +853,7 @@ sql select top(c1, 5) from $stb where ts >= $ts0 and ts <= $tsu group by t1 orde
if $rows != 6 then
return -1
endi
if $data00 != @18-09-17 10:00:00.000@ then
if $data00 != @18-09-17 10:00:00.008@ then
return -1
endi
if $data01 != 6 then
......@@ -873,7 +862,7 @@ endi
if $data02 != 8 then
return -1
endi
if $data10 != @18-09-17 10:10:00.000@ then
if $data10 != @18-09-17 10:10:00.008@ then
return -1
endi
if $data11 != 7 then
......@@ -882,7 +871,7 @@ endi
if $data12 != 8 then
return -1
endi
if $data20 != @18-09-17 10:20:00.000@ then
if $data20 != @18-09-17 10:20:00.008@ then
return -1
endi
if $data21 != 8 then
......@@ -891,7 +880,7 @@ endi
if $data22 != 8 then
return -1
endi
if $data30 != @18-09-17 10:00:00.000@ then
if $data30 != @18-09-17 10:00:00.007@ then
return -1
endi
if $data31 != 6 then
......@@ -900,7 +889,7 @@ endi
if $data32 != 7 then
return -1
endi
if $data40 != @18-09-17 10:10:00.000@ then
if $data40 != @18-09-17 10:10:00.007@ then
return -1
endi
if $data41 != 7 then
......@@ -909,7 +898,7 @@ endi
if $data42 != 7 then
return -1
endi
if $data50 != @18-09-17 10:20:00.000@ then
if $data50 != @18-09-17 10:20:00.007@ then
return -1
endi
if $data51 != 8 then
......@@ -923,7 +912,7 @@ sql select top(c1, 5) from $stb where ts >= $ts0 and ts <= $tsu group by t1 orde
if $rows != 6 then
return -1
endi
if $data00 != @18-09-17 10:00:00.000@ then
if $data00 != @18-09-17 10:00:00.001@ then
return -1
endi
if $data01 != 6 then
......@@ -932,7 +921,7 @@ endi
if $data02 != 1 then
return -1
endi
if $data10 != @18-09-17 10:10:00.000@ then
if $data10 != @18-09-17 10:10:00.001@ then
return -1
endi
if $data11 != 7 then
......@@ -941,7 +930,7 @@ endi
if $data12 != 1 then
return -1
endi
if $data20 != @18-09-17 10:20:00.000@ then
if $data20 != @18-09-17 10:20:00.001@ then
return -1
endi
if $data21 != 8 then
......@@ -950,7 +939,7 @@ endi
if $data22 != 1 then
return -1
endi
if $data30 != @18-09-17 10:00:00.000@ then
if $data30 != @18-09-17 10:00:00.002@ then
return -1
endi
if $data31 != 6 then
......@@ -959,7 +948,7 @@ endi
if $data32 != 2 then
return -1
endi
if $data40 != @18-09-17 10:10:00.000@ then
if $data40 != @18-09-17 10:10:00.002@ then
return -1
endi
if $data41 != 7 then
......@@ -968,7 +957,7 @@ endi
if $data42 != 2 then
return -1
endi
if $data50 != @18-09-17 10:20:00.000@ then
if $data50 != @18-09-17 10:20:00.002@ then
return -1
endi
if $data51 != 8 then
......@@ -982,7 +971,7 @@ sql select top(c1, 5) from $stb where ts >= $ts0 and ts <= $tsu group by t1 orde
if $rows != 6 then
return -1
endi
if $data00 != @18-09-17 10:20:00.000@ then
if $data00 != @18-09-17 10:20:00.001@ then
return -1
endi
if $data01 != 8 then
......@@ -991,7 +980,7 @@ endi
if $data02 != 1 then
return -1
endi
if $data10 != @18-09-17 10:10:00.000@ then
if $data10 != @18-09-17 10:10:00.001@ then
return -1
endi
if $data11 != 7 then
......@@ -1000,7 +989,7 @@ endi
if $data12 != 1 then
return -1
endi
if $data20 != @18-09-17 10:00:00.000@ then
if $data20 != @18-09-17 10:00:00.001@ then
return -1
endi
if $data21 != 6 then
......@@ -1009,7 +998,7 @@ endi
if $data22 != 1 then
return -1
endi
if $data30 != @18-09-17 10:20:00.000@ then
if $data30 != @18-09-17 10:20:00.002@ then
return -1
endi
if $data31 != 8 then
......@@ -1018,7 +1007,7 @@ endi
if $data32 != 2 then
return -1
endi
if $data40 != @18-09-17 10:10:00.000@ then
if $data40 != @18-09-17 10:10:00.002@ then
return -1
endi
if $data41 != 7 then
......@@ -1027,7 +1016,7 @@ endi
if $data42 != 2 then
return -1
endi
if $data50 != @18-09-17 10:00:00.000@ then
if $data50 != @18-09-17 10:00:00.002@ then
return -1
endi
if $data51 != 6 then
......@@ -1052,9 +1041,9 @@ sql select bottom(c1, 5) from $stb where ts >= $ts0 and ts <= $tsu order by ts d
if $rows != 3 then
return -1
endi
if $data00 != @18-09-17 09:00:00.000@ then
return -1
endi
#if $data00 != @18-09-17 09:00:00.000@ then
# return -1
#endi
if $data01 != 0 then
return -1
endi
......@@ -1063,9 +1052,9 @@ sql select bottom(c1, 5) from $stb where ts >= $ts0 and ts <= $tsu order by ts a
if $rows != 3 then
return -1
endi
if $data00 != @18-09-17 09:00:00.000@ then
return -1
endi
#if $data00 != @18-09-17 09:00:00.000@ then
# return -1
#endi
if $data01 != 0 then
return -1
endi
......@@ -1074,54 +1063,54 @@ sql select bottom(c1, 5) from $stb where ts >= $ts0 and ts <= $tsu group by t1 o
if $rows != 6 then
return -1
endi
if $data00 != @18-09-17 09:30:00.000@ then
return -1
endi
#if $data00 != @18-09-17 09:30:00.000@ then
# return -1
#endi
if $data01 != 3 then
return -1
endi
if $data02 != 8 then
return -1
endi
if $data10 != @18-09-17 09:20:00.000@ then
return -1
endi
#if $data10 != @18-09-17 09:20:00.000@ then
# return -1
#endi
if $data11 != 2 then
return -1
endi
if $data12 != 8 then
return -1
endi
if $data20 != @18-09-17 09:10:00.000@ then
return -1
endi
#if $data20 != @18-09-17 09:10:00.000@ then
# return -1
#endi
if $data21 != 1 then
return -1
endi
if $data22 != 8 then
return -1
endi
if $data30 != @18-09-17 09:30:00.000@ then
return -1
endi
#if $data30 != @18-09-17 09:30:00.000@ then
# return -1
#endi
if $data31 != 3 then
return -1
endi
if $data32 != 7 then
return -1
endi
if $data40 != @18-09-17 09:20:00.000@ then
return -1
endi
#if $data40 != @18-09-17 09:20:00.000@ then
# return -1
#endi
if $data41 != 2 then
return -1
endi
if $data42 != 7 then
return -1
endi
if $data50 != @18-09-17 09:10:00.000@ then
return -1
endi
#if $data50 != @18-09-17 09:10:00.000@ then
# return -1
#endi
if $data51 != 1 then
return -1
endi
......@@ -1133,54 +1122,54 @@ sql select bottom(c1, 5) from $stb where ts >= $ts0 and ts <= $tsu group by t1 o
if $rows != 6 then
return -1
endi
if $data00 != @18-09-17 09:30:00.000@ then
return -1
endi
#if $data00 != @18-09-17 09:30:00.000@ then
# return -1
#endi
if $data01 != 3 then
return -1
endi
if $data02 != 1 then
return -1
endi
if $data10 != @18-09-17 09:20:00.000@ then
return -1
endi
#if $data10 != @18-09-17 09:20:00.000@ then
# return -1
#endi
if $data11 != 2 then
return -1
endi
if $data12 != 1 then
return -1
endi
if $data20 != @18-09-17 09:10:00.000@ then
return -1
endi
#if $data20 != @18-09-17 09:10:00.000@ then
# return -1
#endi
if $data21 != 1 then
return -1
endi
if $data22 != 1 then
return -1
endi
if $data30 != @18-09-17 09:30:00.000@ then
return -1
endi
#if $data30 != @18-09-17 09:30:00.000@ then
# return -1
#endi
if $data31 != 3 then
return -1
endi
if $data32 != 2 then
return -1
endi
if $data40 != @18-09-17 09:20:00.000@ then
return -1
endi
#if $data40 != @18-09-17 09:20:00.000@ then
# return -1
#endi
if $data41 != 2 then
return -1
endi
if $data42 != 2 then
return -1
endi
if $data50 != @18-09-17 09:10:00.000@ then
return -1
endi
#if $data50 != @18-09-17 09:10:00.000@ then
# return -1
#endi
if $data51 != 1 then
return -1
endi
......@@ -1192,54 +1181,54 @@ sql select bottom(c1, 5) from $stb where ts >= $ts0 and ts <= $tsu group by t1 o
if $rows != 6 then
return -1
endi
if $data00 != @18-09-17 09:30:00.000@ then
return -1
endi
#if $data00 != @18-09-17 09:30:00.000@ then
# return -1
#endi
if $data01 != 3 then
return -1
endi
if $data02 != 1 then
return -1
endi
if $data10 != @18-09-17 09:20:00.000@ then
return -1
endi
#if $data10 != @18-09-17 09:20:00.000@ then
# return -1
#endi
if $data11 != 2 then
return -1
endi
if $data12 != 1 then
return -1
endi
if $data20 != @18-09-17 09:10:00.000@ then
return -1
endi
#if $data20 != @18-09-17 09:10:00.000@ then
# return -1
#endi
if $data21 != 1 then
return -1
endi
if $data22 != 1 then
return -1
endi
if $data30 != @18-09-17 09:30:00.000@ then
return -1
endi
#if $data30 != @18-09-17 09:30:00.000@ then
# return -1
#endi
if $data31 != 3 then
return -1
endi
if $data32 != 2 then
return -1
endi
if $data40 != @18-09-17 09:20:00.000@ then
return -1
endi
#if $data40 != @18-09-17 09:20:00.000@ then
# return -1
#endi
if $data41 != 2 then
return -1
endi
if $data42 != 2 then
return -1
endi
if $data50 != @18-09-17 09:10:00.000@ then
return -1
endi
#if $data50 != @18-09-17 09:10:00.000@ then
# return -1
#endi
if $data51 != 1 then
return -1
endi
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册