shaofengshi closed pull request #292: KYLIN-3634 when filter column has null
value may cause incorrect query result
URL: https://github.com/apache/kylin/pull/292
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/core-cube/src/main/java/org/apache/kylin/gridtable/GTUtil.java
b/core-cube/src/main/java/org/apache/kylin/gridtable/GTUtil.java
index f03329b2f8..298225f166 100644
--- a/core-cube/src/main/java/org/apache/kylin/gridtable/GTUtil.java
+++ b/core-cube/src/main/java/org/apache/kylin/gridtable/GTUtil.java
@@ -297,7 +297,7 @@ protected TupleFilter encodeConstants(CompareTupleFilter
oldCompareFilter) {
case NEQ:
code = translate(col, firstValue, 0);
if (code == null) {
- result = ConstantTupleFilter.TRUE;
+ result =
newCompareFilter(TupleFilter.FilterOperatorEnum.ISNOTNULL, externalCol);
} else {
newCompareFilter.addChild(new ConstantTupleFilter(code));
result = newCompareFilter;
@@ -308,7 +308,7 @@ protected TupleFilter encodeConstants(CompareTupleFilter
oldCompareFilter) {
if (code == null) {
code = translate(col, firstValue, -1);
if (code == null)
- result = ConstantTupleFilter.FALSE;
+ result =
newCompareFilter(TupleFilter.FilterOperatorEnum.ISNOTNULL, externalCol);
else
result = newCompareFilter(FilterOperatorEnum.LTE,
externalCol, code);
} else {
@@ -330,7 +330,7 @@ protected TupleFilter encodeConstants(CompareTupleFilter
oldCompareFilter) {
if (code == null) {
code = translate(col, firstValue, 1);
if (code == null)
- result = ConstantTupleFilter.FALSE;
+ result =
newCompareFilter(TupleFilter.FilterOperatorEnum.ISNOTNULL, externalCol);
else
result = newCompareFilter(FilterOperatorEnum.GTE,
externalCol, code);
} else {
@@ -360,6 +360,12 @@ private TupleFilter newCompareFilter(FilterOperatorEnum
op, TblColRef col, ByteA
return r;
}
+ private TupleFilter newCompareFilter(TupleFilter.FilterOperatorEnum
op, TblColRef col) {
+ CompareTupleFilter r = new CompareTupleFilter(op);
+ r.addChild(new ColumnTupleFilter(col));
+ return r;
+ }
+
transient ByteBuffer buf;
protected ByteArray translate(int col, Object value, int roundingFlag)
{
diff --git
a/core-storage/src/test/java/org/apache/kylin/storage/gtrecord/DictGridTableTest.java
b/core-storage/src/test/java/org/apache/kylin/storage/gtrecord/DictGridTableTest.java
index b8de556520..d80df7870b 100644
---
a/core-storage/src/test/java/org/apache/kylin/storage/gtrecord/DictGridTableTest.java
+++
b/core-storage/src/test/java/org/apache/kylin/storage/gtrecord/DictGridTableTest.java
@@ -415,7 +415,9 @@ public void verifyConvertFilterConstants2() {
{
LogicalTupleFilter filter = and(fComp1, compare(extColB,
FilterOperatorEnum.LT, "9"));
TupleFilter newFilter =
GTUtil.convertFilterColumnsAndConstants(filter, info, colMapping, null);
- assertEquals(ConstantTupleFilter.FALSE, newFilter);
+ assertEquals(
+ "AND [UNKNOWN_MODEL:NULL.GT_MOCKUP_TABLE.0 GT
[\\x00\\x00\\x01J\\xE5\\xBD\\x5C\\x00], UNKNOWN_MODEL:NULL.GT_MOCKUP_TABLE.1
ISNOTNULL []]",
+ newFilter.toString());
}
// $1<"10" needs no rounding
@@ -480,7 +482,8 @@ public void verifyConvertFilterConstants3() {
{
LogicalTupleFilter filter = and(fComp1, compare(extColB,
FilterOperatorEnum.GT, "101"));
TupleFilter newFilter =
GTUtil.convertFilterColumnsAndConstants(filter, info, colMapping, null);
- assertEquals(ConstantTupleFilter.FALSE, newFilter);
+ assertEquals("AND [UNKNOWN_MODEL:NULL.GT_MOCKUP_TABLE.0 GT
[\\x00\\x00\\x01J\\xE5\\xBD\\x5C\\x00], UNKNOWN_MODEL:NULL.GT_MOCKUP_TABLE.1
ISNOTNULL []]",
+ newFilter.toString());
}
// $1>"100" needs no rounding
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
