vvivekiyer commented on code in PR #15350: URL: https://github.com/apache/pinot/pull/15350#discussion_r2060710596
########## pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/BaseSingleStageBrokerRequestHandler.java: ########## @@ -1729,6 +1729,7 @@ static void updateColumnNames(String rawTableName, PinotQuery pinotQuery, boolea hasStar = true; } } + pinotQuery.setSelectStarQuery(hasStar); Review Comment: can we use queryOption to pass this detail to the server? ########## pinot-common/src/thrift/query.thrift: ########## @@ -32,6 +32,7 @@ struct PinotQuery { 11: optional map<string, string> queryOptions; 12: optional bool explain; 13: optional map<Expression, Expression> expressionOverrideHints; + 14: optional bool selectStarQuery; Review Comment: +1 . Let's use queryOption to pass this detail to the server. ########## pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/BaseSingleStageBrokerRequestHandler.java: ########## @@ -1729,6 +1729,7 @@ static void updateColumnNames(String rawTableName, PinotQuery pinotQuery, boolea hasStar = true; } } + pinotQuery.setSelectStarQuery(hasStar); Review Comment: Can you test how this works in Multistage query execution? The problem should remain the same during leaf-stage processing. We should fix it there as well. Or at least leave a TODO. ########## pinot-core/src/main/java/org/apache/pinot/core/operator/combine/merger/SelectionOnlyResultsBlockMerger.java: ########## @@ -46,15 +50,42 @@ public void mergeResultsBlocks(SelectionResultsBlock mergedBlock, SelectionResul DataSchema mergedDataSchema = mergedBlock.getDataSchema(); DataSchema dataSchemaToMerge = blockToMerge.getDataSchema(); assert mergedDataSchema != null && dataSchemaToMerge != null; - if (!mergedDataSchema.equals(dataSchemaToMerge)) { - String errorMessage = - String.format("Data schema mismatch between merged block: %s and block to merge: %s, drop block to merge", + QueryContext mergedQueryContext = mergedBlock.getQueryContext(); Review Comment: We also need this logic in SelectionOnlyOrderByResultBlockMerger. Please make the changes there as well. -- 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: commits-unsubscr...@pinot.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org For additional commands, e-mail: commits-h...@pinot.apache.org