FrankChen021 commented on PR #20466: URL: https://github.com/apache/druid/pull/20466#issuecomment-6290862333
@gianm this PR now conflicts with `master`. Could you resolve the conflicts? The conflicting files are: - `docs/querying/query-context-reference.md` - `multi-stage-query/src/main/java/org/apache/druid/msq/querykit/scan/ScanQueryStageProcessor.java` - `multi-stage-query/src/test/java/org/apache/druid/msq/test/DecoupledDartCalciteJoinQueryTest.java` - `sql/src/test/java/org/apache/druid/sql/calcite/CalciteSubqueryTest.java` - `sql/src/test/java/org/apache/druid/sql/calcite/DecoupledExtension.java` - `sql/src/test/java/org/apache/druid/sql/calcite/QueryTestRunner.java` About the docs conflict: query context parameter descriptions are now defined in [`QueryContextParameters`](https://github.com/apache/druid/blob/master/processing/src/main/java/org/apache/druid/query/context/QueryContextParameters.java), and the table rows in `query-context-reference.md` (the ones ending with `<!-- GENERATED QUERY CONTEXT PARAMETER: ... -->`) are generated from it. So the updated `vectorize` description should go into the `VECTORIZE` descriptor instead of the Markdown table. After that, regenerate the docs: ``` mvn process-classes -pl processing -Dquery.context.docs.mode=generate -Pskip-static-checks ``` The build verifies that the generated rows match by default, so a hand-edited row would fail. The paragraph above the table about TopN/Scan under `"force"` isn't generated, so that change can stay in the Markdown. -- 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]
