cryptoe commented on code in PR #13952:
URL: https://github.com/apache/druid/pull/13952#discussion_r1142035052
##########
server/src/main/java/org/apache/druid/server/ClientQuerySegmentWalker.java:
##########
@@ -577,25 +632,71 @@ private static <T, QueryType extends Query<T>>
InlineDataSource toInlineDataSour
);
}
+ if (memoryLimitAccumulator.get() >= memoryLimitToUse) {
+ throw ResourceLimitExceededException.withMessage(
+ "Cannot issue subquery, maximum subquery result bytes[%d] reached",
+ memoryLimitToUse
+ );
+ }
+
final RowSignature signature = toolChest.resultArraySignature(query);
- final ArrayList<Object[]> resultList = new ArrayList<>();
+ final List<Object[]> resultList = toolChest.resultsAsArrays(query,
results).toList();
- toolChest.resultsAsArrays(query, results).accumulate(
- resultList,
- (acc, in) -> {
- if (limitAccumulator.getAndIncrement() >= limitToUse) {
- throw ResourceLimitExceededException.withMessage(
- "Subquery generated results beyond maximum[%d]",
- limitToUse
- );
+ if (limitAccumulator.addAndGet(resultList.size()) >= limitToUse) {
+ throw ResourceLimitExceededException.withMessage(
+ "Subquery generated results beyond maximum[%d] rows",
+ limitToUse
+ );
+ }
+
+ Frame frame = null;
+
+ // Try to serialize the results into a frame only if the memory limit is
set on the server or the query
+ if (memoryLimitSet) {
Review Comment:
We should only serialize the frames only when memoryLimit Is set else the
old code path should be invoked.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
