xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix fill prev/next error

This commit is contained in:
Ganlin Zhao 2022-11-18 15:53:58 +08:00
parent 7291f2bd5a
commit 4703ccc4bc
2 changed files with 64 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
source/libs/executor/src/timewindowoperator.c
View File

@ -1945,10 +1945,8 @@ static void doKeepPrevRows(STimeSliceOperatorInfo* pSliceInfo, const SSDataBlock
for (int32_t i = 0; i < numOfCols; ++i) { for (int32_t i = 0; i < numOfCols; ++i) {
SColumnInfoData* pColInfoData = taosArrayGet(pBlock->pDataBlock, i); SColumnInfoData* pColInfoData = taosArrayGet(pBlock->pDataBlock, i);
// null data should not be kept since it can not be used to perform interpolation SGroupKeys* pkey = taosArrayGet(pSliceInfo->pPrevRow, i);
if (!colDataIsNull_s(pColInfoData, i)) { if (!colDataIsNull_s(pColInfoData, rowIndex)) {
SGroupKeys* pkey = taosArrayGet(pSliceInfo->pPrevRow, i);
pkey->isNull = false; pkey->isNull = false;
char* val = colDataGetData(pColInfoData, rowIndex); char* val = colDataGetData(pColInfoData, rowIndex);
if (!IS_VAR_DATA_TYPE(pkey->type)) { if (!IS_VAR_DATA_TYPE(pkey->type)) {
@ -1956,6 +1954,8 @@ static void doKeepPrevRows(STimeSliceOperatorInfo* pSliceInfo, const SSDataBlock
} else { } else {
memcpy(pkey->pData, val, varDataLen(val)); memcpy(pkey->pData, val, varDataLen(val));
} }
} else {
pkey->isNull = true;
} }
} }
@ -1967,10 +1967,8 @@ static void doKeepNextRows(STimeSliceOperatorInfo* pSliceInfo, const SSDataBlock
for (int32_t i = 0; i < numOfCols; ++i) { for (int32_t i = 0; i < numOfCols; ++i) {
SColumnInfoData* pColInfoData = taosArrayGet(pBlock->pDataBlock, i); SColumnInfoData* pColInfoData = taosArrayGet(pBlock->pDataBlock, i);
// null data should not be kept since it can not be used to perform interpolation SGroupKeys* pkey = taosArrayGet(pSliceInfo->pNextRow, i);
if (!colDataIsNull_s(pColInfoData, i)) { if (!colDataIsNull_s(pColInfoData, rowIndex)) {
SGroupKeys* pkey = taosArrayGet(pSliceInfo->pNextRow, i);
pkey->isNull = false; pkey->isNull = false;
char* val = colDataGetData(pColInfoData, rowIndex); char* val = colDataGetData(pColInfoData, rowIndex);
if (!IS_VAR_DATA_TYPE(pkey->type)) { if (!IS_VAR_DATA_TYPE(pkey->type)) {
@ -1978,6 +1976,8 @@ static void doKeepNextRows(STimeSliceOperatorInfo* pSliceInfo, const SSDataBlock
} else { } else {
memcpy(pkey->pData, val, varDataLen(val)); memcpy(pkey->pData, val, varDataLen(val));
} }
} else {
pkey->isNull = true;
} }
} }
@ -2100,7 +2100,11 @@ static bool genInterpolationResult(STimeSliceOperatorInfo* pSliceInfo, SExprSupp
} }
SGroupKeys* pkey = taosArrayGet(pSliceInfo->pPrevRow, srcSlot); SGroupKeys* pkey = taosArrayGet(pSliceInfo->pPrevRow, srcSlot);
colDataAppend(pDst, rows, pkey->pData, false); if (pkey->isNull == false) {
colDataAppend(pDst, rows, pkey->pData, false);
} else {
colDataAppendNULL(pDst, rows);
}
break; break;
} }
@ -2111,7 +2115,11 @@ static bool genInterpolationResult(STimeSliceOperatorInfo* pSliceInfo, SExprSupp
} }
SGroupKeys* pkey = taosArrayGet(pSliceInfo->pNextRow, srcSlot); SGroupKeys* pkey = taosArrayGet(pSliceInfo->pNextRow, srcSlot);
colDataAppend(pDst, rows, pkey->pData, false); if (pkey->isNull == false) {
colDataAppend(pDst, rows, pkey->pData, false);
} else {
colDataAppendNULL(pDst, rows);
}
break; break;
} }

60
tests/system-test/2-query/interp.py
View File

@ -39,8 +39,6 @@ class TDTestCase:
tdSql.execute(f"insert into {dbname}.{tbname} values ('2020-02-01 00:00:10', 10, 10, 10, 10, 10.0, 10.0, true, 'varchar', 'nchar')") tdSql.execute(f"insert into {dbname}.{tbname} values ('2020-02-01 00:00:10', 10, 10, 10, 10, 10.0, 10.0, true, 'varchar', 'nchar')")
tdSql.execute(f"insert into {dbname}.{tbname} values ('2020-02-01 00:00:15', 15, 15, 15, 15, 15.0, 15.0, true, 'varchar', 'nchar')") tdSql.execute(f"insert into {dbname}.{tbname} values ('2020-02-01 00:00:15', 15, 15, 15, 15, 15.0, 15.0, true, 'varchar', 'nchar')")
tdSql.execute(f"insert into {dbname}.{tbname} (ts) values (now)")
tdLog.printNoPrefix("==========step3:fill null") tdLog.printNoPrefix("==========step3:fill null")
## {. . .} ## {. . .}
@ -248,7 +246,7 @@ class TDTestCase:
## {. . .} ## {. . .}
tdSql.query(f"select interp(c0) from {dbname}.{tbname} range('2020-02-01 00:00:04', '2020-02-01 00:00:16') every(1s) fill(next)") tdSql.query(f"select interp(c0) from {dbname}.{tbname} range('2020-02-01 00:00:04', '2020-02-01 00:00:16') every(1s) fill(next)")
tdSql.checkRows(13) tdSql.checkRows(12)
tdSql.checkData(0, 0, 5) tdSql.checkData(0, 0, 5)
tdSql.checkData(1, 0, 5) tdSql.checkData(1, 0, 5)
tdSql.checkData(2, 0, 10) tdSql.checkData(2, 0, 10)
@ -298,14 +296,14 @@ class TDTestCase:
## ..{.} ## ..{.}
tdSql.query(f"select interp(c0) from {dbname}.{tbname} range('2020-02-01 00:00:13', '2020-02-01 00:00:17') every(1s) fill(next)") tdSql.query(f"select interp(c0) from {dbname}.{tbname} range('2020-02-01 00:00:13', '2020-02-01 00:00:17') every(1s) fill(next)")
tdSql.checkRows(5) tdSql.checkRows(3)
tdSql.checkData(0, 0, 15) tdSql.checkData(0, 0, 15)
tdSql.checkData(1, 0, 15) tdSql.checkData(1, 0, 15)
tdSql.checkData(2, 0, 15) tdSql.checkData(2, 0, 15)
## ... {} ## ... {}
tdSql.query(f"select interp(c0) from {dbname}.{tbname} range('2020-02-01 00:00:16', '2020-02-01 00:00:19') every(1s) fill(next)") tdSql.query(f"select interp(c0) from {dbname}.{tbname} range('2020-02-01 00:00:16', '2020-02-01 00:00:19') every(1s) fill(next)")
tdSql.checkRows(4) tdSql.checkRows(0)
tdLog.printNoPrefix("==========step7:fill linear") tdLog.printNoPrefix("==========step7:fill linear")
@ -513,7 +511,7 @@ class TDTestCase:
tdSql.checkData(8, 0, '2020-02-01 00:00:12.000') tdSql.checkData(8, 0, '2020-02-01 00:00:12.000')
tdSql.query(f"select _irowts,interp(c0) from {dbname}.{tbname} range('2020-02-01 00:00:04', '2020-02-01 00:00:16') every(1s) fill(next)") tdSql.query(f"select _irowts,interp(c0) from {dbname}.{tbname} range('2020-02-01 00:00:04', '2020-02-01 00:00:16') every(1s) fill(next)")
tdSql.checkRows(13) tdSql.checkRows(12)
tdSql.checkCols(2) tdSql.checkCols(2)
tdSql.checkData(0, 0, '2020-02-01 00:00:04.000') tdSql.checkData(0, 0, '2020-02-01 00:00:04.000')
@ -925,7 +923,7 @@ class TDTestCase:
tdSql.query(f"select interp(c0) from {dbname}.{tbname1} range('2020-02-01 23:59:59', '2020-02-02 00:00:08') every(1s) fill(linear)") tdSql.query(f"select interp(c0) from {dbname}.{tbname1} range('2020-02-01 23:59:59', '2020-02-02 00:00:08') every(1s) fill(linear)")
tdSql.checkRows(9) tdSql.checkRows(9)
tdSql.checkData(0, 0, None) tdSql.checkData(0, 0, 0)
tdSql.checkData(1, 0, None) tdSql.checkData(1, 0, None)
tdSql.checkData(2, 0, None) tdSql.checkData(2, 0, None)
tdSql.checkData(3, 0, None) tdSql.checkData(3, 0, None)
@ -1274,18 +1272,18 @@ class TDTestCase:
tdSql.query(f"select interp(c1) from {dbname}.{tbname1} range('2020-02-02 00:00:00', '2020-02-02 00:00:35') every(1s) fill(linear)") tdSql.query(f"select interp(c1) from {dbname}.{tbname1} range('2020-02-02 00:00:00', '2020-02-02 00:00:35') every(1s) fill(linear)")
tdSql.checkRows(36) tdSql.checkRows(36)
tdSql.checkData(10, 0, 10) tdSql.checkData(10, 0, 10)
tdSql.checkData(30, 0, 30) tdSql.checkData(30, 0, 30)
tdSql.query(f"select interp(c1) from {dbname}.{tbname1} range('2020-02-02 00:00:00', '2020-02-02 00:00:40') every(1s) fill(linear)") tdSql.query(f"select interp(c1) from {dbname}.{tbname1} range('2020-02-02 00:00:00', '2020-02-02 00:00:40') every(1s) fill(linear)")
tdSql.checkRows(41) tdSql.checkRows(41)
tdSql.checkData(0, 0, 10) tdSql.checkData(10, 0, 10)
tdSql.checkData(30, 0, 30) tdSql.checkData(30, 0, 30)
tdSql.checkData(40, 0, 40) tdSql.checkData(40, 0, 40)
tdSql.query(f"select interp(c1) from {dbname}.{tbname1} range('2020-02-02 00:00:00', '2020-02-02 00:00:45') every(1s) fill(linear)") tdSql.query(f"select interp(c1) from {dbname}.{tbname1} range('2020-02-02 00:00:00', '2020-02-02 00:00:45') every(1s) fill(linear)")
tdSql.checkRows(46) tdSql.checkRows(46)
tdSql.checkData(0, 0, 10) tdSql.checkData(10, 0, 10)
tdSql.checkData(30, 0, 30) tdSql.checkData(30, 0, 30)
tdSql.checkData(40, 0, 40) tdSql.checkData(40, 0, 40)
tdSql.checkData(41, 0, 41) tdSql.checkData(41, 0, 41)
@ -1296,7 +1294,7 @@ class TDTestCase:
tdSql.query(f"select interp(c1) from {dbname}.{tbname1} range('2020-02-02 00:00:00', '2020-02-02 00:00:50') every(1s) fill(linear)") tdSql.query(f"select interp(c1) from {dbname}.{tbname1} range('2020-02-02 00:00:00', '2020-02-02 00:00:50') every(1s) fill(linear)")
tdSql.checkRows(51) tdSql.checkRows(51)
tdSql.checkData(0, 0, 10) tdSql.checkData(10, 0, 10)
tdSql.checkData(30, 0, 30) tdSql.checkData(30, 0, 30)
tdSql.checkData(40, 0, 40) tdSql.checkData(40, 0, 40)
tdSql.checkData(41, 0, 41) tdSql.checkData(41, 0, 41)
@ -1308,7 +1306,7 @@ class TDTestCase:
tdSql.query(f"select interp(c1) from {dbname}.{tbname1} range('2020-02-02 00:00:00', '2020-02-02 00:00:55') every(1s) fill(linear)") tdSql.query(f"select interp(c1) from {dbname}.{tbname1} range('2020-02-02 00:00:00', '2020-02-02 00:00:55') every(1s) fill(linear)")
tdSql.checkRows(56) tdSql.checkRows(56)
tdSql.checkData(0, 0, 10) tdSql.checkData(10, 0, 10)
tdSql.checkData(30, 0, 30) tdSql.checkData(30, 0, 30)
tdSql.checkData(40, 0, 40) tdSql.checkData(40, 0, 40)
tdSql.checkData(41, 0, 41) tdSql.checkData(41, 0, 41)
@ -1319,8 +1317,8 @@ class TDTestCase:
tdSql.query(f"select interp(c1) from {dbname}.{tbname1} range('2020-02-02 00:00:00', '2020-02-02 00:01:00') every(1s) fill(linear)") tdSql.query(f"select interp(c1) from {dbname}.{tbname1} range('2020-02-02 00:00:00', '2020-02-02 00:01:00') every(1s) fill(linear)")
tdSql.checkRows(60) tdSql.checkRows(61)
tdSql.checkData(0, 0, 10) tdSql.checkData(10, 0, 10)
tdSql.checkData(30, 0, 30) tdSql.checkData(30, 0, 30)
tdSql.checkData(40, 0, 40) tdSql.checkData(40, 0, 40)
tdSql.checkData(41, 0, 41) tdSql.checkData(41, 0, 41)
@ -1368,6 +1366,40 @@ class TDTestCase:
tdSql.checkData(15, 0, 45) tdSql.checkData(15, 0, 45)
tdSql.checkData(30, 0, 60) tdSql.checkData(30, 0, 60)
# two interps
tdSql.query(f"select interp(c0),interp(c1) from {dbname}.{tbname1} range('2020-02-02 00:00:00', '2020-02-02 00:01:00') every(1s) fill(linear)")
tdSql.checkRows(61)
tdSql.checkCols(2)
tdSql.checkData(0, 0, 0)
tdSql.checkData(10, 0, 10)
tdSql.checkData(20, 0, 20)
tdSql.checkData(30, 0, 30)
tdSql.checkData(31, 0, 31)
tdSql.checkData(32, 0, 32)
tdSql.checkData(33, 0, 33)
tdSql.checkData(34, 0, 34)
tdSql.checkData(35, 0, 35)
tdSql.checkData(36, 0, 36)
tdSql.checkData(37, 0, 37)
tdSql.checkData(38, 0, 38)
tdSql.checkData(39, 0, 39)
tdSql.checkData(40, 0, 40)
tdSql.checkData(50, 0, 50)
tdSql.checkData(60, 0, 55)
tdSql.checkData(0, 1, None)
tdSql.checkData(10, 1, 10)
tdSql.checkData(20, 1, None)
tdSql.checkData(30, 1, 30)
tdSql.checkData(40, 1, 40)
tdSql.checkData(41, 1, 41)
tdSql.checkData(42, 1, 42)
tdSql.checkData(43, 1, 43)
tdSql.checkData(44, 1, 44)
tdSql.checkData(45, 1, 45)
tdSql.checkData(50, 1, None)
tdSql.checkData(60, 1, 60)
tdLog.printNoPrefix("==========step11:test multi-interp cases") tdLog.printNoPrefix("==========step11:test multi-interp cases")
tdSql.query(f"select interp(c0),interp(c1),interp(c2),interp(c3) from {dbname}.{tbname} range('2020-02-09 00:00:05', '2020-02-13 00:00:05') every(1d) fill(null)") tdSql.query(f"select interp(c0),interp(c1),interp(c2),interp(c3) from {dbname}.{tbname} range('2020-02-09 00:00:05', '2020-02-13 00:00:05') every(1d) fill(null)")
tdSql.checkRows(5) tdSql.checkRows(5)