github-code-scanning[bot] commented on code in PR #13952:
URL: https://github.com/apache/druid/pull/13952#discussion_r1142014035
##########
server/src/main/java/org/apache/druid/server/ClientQuerySegmentWalker.java:
##########
@@ -577,25 +632,71 @@
);
}
+ 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) {
+ try {
+ FrameWriterFactory frameWriterFactory =
FrameWriters.makeFrameWriterFactory(
+ FrameType.ROW_BASED,
+ new SingleMemoryAllocatorFactory(HeapMemoryAllocator.unlimited()),
+ signature,
+ new ArrayList<>()
+ );
+
+ final Cursor cursor = new InlineResultsCursor(resultList, signature);
+
+ try (final FrameWriter frameWriter =
frameWriterFactory.newFrameWriter(cursor.getColumnSelectorFactory())) {
+ while (!cursor.isDone()) {
+ if (!frameWriter.addSelection()) {
+ throw new
FrameRowTooLargeException(frameWriterFactory.allocatorCapacity());
+ }
+
+ cursor.advance();
}
- acc.add(in);
- return acc;
+
+ frame = Frame.wrap(frameWriter.toByteArray());
}
- );
- return InlineDataSource.fromIterable(resultList, signature);
+
+ if (memoryLimitAccumulator.addAndGet(frame.numBytes()) >=
memoryLimitToUse) {
+ throw ResourceLimitExceededException.withMessage(
+ "Subquery generated results beyond maximum[%d] bytes",
+ memoryLimit
+ );
+ }
+ }
+ catch (ResourceLimitExceededException rlee) {
+ throw rlee;
+ }
+ catch (Exception e) {
+ log.info("Unable to write the subquery results to a frame. Results
won't be accounted for in the memory"
+ + "calculation");
Review Comment:
## Missing space in string literal
This string appears to be missing a space after 'memory'.
[Show more
details](https://github.com/apache/druid/security/code-scanning/4411)
--
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]
