Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Created an error message for when someone tries to time order a result 

set > threshold limit
This commit is contained in:
Justin Borromeo 2019-02-06 15:36:24 -08:00
parent e8a4b49044
commit 7e872a8ebc
1 changed files with 168 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
processing/src/main/java/org/apache/druid/query/scan/ScanQueryQueryToolChest.java
View File

@ -91,14 +91,14 @@ public class ScanQueryQueryToolChest extends QueryToolChest<ScanResultValue, Sca
} }
}; };
if (scanQuery.getTimeOrder().equals(ScanQuery.TIME_ORDER_NONE) || if (scanQuery.getTimeOrder().equals(ScanQuery.TIME_ORDER_NONE)) {
scanQuery.getLimit() > maxRowsForInMemoryTimeOrdering) {
if (scanQuery.getLimit() == Long.MAX_VALUE) { if (scanQuery.getLimit() == Long.MAX_VALUE) {
return runner.run(queryPlusWithNonNullLegacy, responseContext); return runner.run(queryPlusWithNonNullLegacy, responseContext);
} }
return new BaseSequence<ScanResultValue, ScanQueryLimitRowIterator>(scanQueryLimitRowIteratorMaker); return new BaseSequence<ScanResultValue, ScanQueryLimitRowIterator>(scanQueryLimitRowIteratorMaker);
} else if (scanQuery.getTimeOrder().equals(ScanQuery.TIME_ORDER_ASCENDING) || } else if ((scanQuery.getTimeOrder().equals(ScanQuery.TIME_ORDER_ASCENDING) ||
scanQuery.getTimeOrder().equals(ScanQuery.TIME_ORDER_DESCENDING)) { scanQuery.getTimeOrder().equals(ScanQuery.TIME_ORDER_DESCENDING))
&& scanQuery.getLimit() <= scanQueryConfig.getMaxRowsTimeOrderedInMemory()) {
Iterator<ScanResultValue> scanResultIterator = scanQueryLimitRowIteratorMaker.make(); Iterator<ScanResultValue> scanResultIterator = scanQueryLimitRowIteratorMaker.make();
return new BaseSequence( return new BaseSequence(
@ -119,6 +119,13 @@ public class ScanQueryQueryToolChest extends QueryToolChest<ScanResultValue, Sca
CloseQuietly.close(iterFromMake); CloseQuietly.close(iterFromMake);
} }
}); });
} else if (scanQuery.getLimit() > scanQueryConfig.getMaxRowsTimeOrderedInMemory()) {
throw new UOE(
"Time ordering for result set limit of %s is not supported. Try lowering the "
+ "result set size to less than or equal to the time ordering limit of %s.",
scanQuery.getLimit(),
scanQueryConfig.getMaxRowsTimeOrderedInMemory()
);
} else { } else {
throw new UOE("Time ordering [%s] is not supported", scanQuery.getTimeOrder()); throw new UOE("Time ordering [%s] is not supported", scanQuery.getTimeOrder());
} }