Catch up feature/mustang-ppl-integration with main: version bump to 3.7#5397
Open
ahkcs wants to merge 1 commit intoopensearch-project:feature/mustang-ppl-integrationfrom
Open
Catch up feature/mustang-ppl-integration with main: version bump to 3.7#5397ahkcs wants to merge 1 commit intoopensearch-project:feature/mustang-ppl-integrationfrom
ahkcs wants to merge 1 commit intoopensearch-project:feature/mustang-ppl-integrationfrom
Conversation
ahkcs
requested review from
LantaoJin,
RyanL1997,
Swiddis,
acarbonetto,
anirudha,
dai-chen,
joshuali925,
mengweieric,
noCharger,
penghuo,
ps48,
qianheng-aws,
songkant-aws,
vamsimanohar,
ykmr1224 and
yuancu
as code owners
Contributor
PR Code Analyzer ❗AI-powered 'Code-Diff-Analyzer' found issues on commit 1ceb5b7. 'Diff too large, requires skip by maintainers after manual review' Pull Requests Author(s): Please update your Pull Request according to the report above. Repository Maintainer(s): You can Thanks. |
ahkcs
force-pushed
the
pr/async-executor-update
branch
from
c4396f9 to
1ceb5b7
Compare
ahkcs
added
maintenance
Catch up the analytics-engine feature branch with main as a single
squashed commit. The PR is opened against feature/mustang-ppl-integration;
when merged, the feature branch will reflect main's current state plus
the analytics-engine work already on it.
Squashed because the upstream main commits were authored by many
contributors with inconsistent DCO sign-offs (sign-offs missing or
formatted differently from author identity); DCO would otherwise reject
those upstream commits we cannot rewrite.
Resolved 16 merge conflicts:
Mechanical / append-both (9 files):
- CLAUDE.md, docs/user/ppl/functions/condition.md (took main)
- explain_streamstats_global{,_null_bucket}.yaml (took main, post-opensearch-project#5359)
- core/calcite/CalciteRelNodeVisitor.java, core/calcite/utils/PlanUtils.java
(collation utility was hoisted from CalciteRelNodeVisitor.backtrackForCollation
into PlanUtils.findInputCollation on main; took main)
- integ-test/calcite/CalciteNoPushdownIT.java (added CalciteMixedFieldTypeIT)
- ppl/antlr/OpenSearchPPLParser.g4 (added unionCommand)
- ppl/calcite/CalcitePPLStreamstatsTest.java (added testMultipleStreamstatsWithWindow)
Took main (api LanguageSpec evolution subsumes our side, 5 files):
- api/UnifiedQueryContext.java, UnifiedQueryPlanner.java
- api/UnifiedQueryPlannerSqlTest.java, UnifiedQueryTestBase.java
- plugin/SQLPlugin.java imports
Hand-merged (2 files):
- core/executor/QueryService.java: composed analytics-engine's
CalciteClassLoaderHelper wrapper around main's StageErrorHandler
stage-tracked phases; both improvements are orthogonal and apply.
- plugin/transport/TransportPPLQueryAction.java: kept both queryPlanExecutor
parameter (analytics-engine wiring) and extensionsHolder parameter
(main's engine extensions) since both are referenced in the constructor body.
Signed-off-by: Kai Huang <ahkcs@amazon.com>
ahkcs
force-pushed
the
pr/async-executor-update
branch
from
1ceb5b7 to
af831d3
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
This is the first in a series of catch-up PRs to bring
feature/mustang-ppl-integrationup to date withmain. It introduces the OpenSearch 3.7 version bump and the matching analytics-engine vendored JARs.Subsequent PRs will continue merging the remaining commits from
main(PPL bug fixes, new commands, etc.) into the feature branch incrementally so each chunk can be reviewed and CI-validated on its own.Commits in this PR
_sourceexcludes serialization.libs/analytics-engine-*.jarandlibs/analytics-framework-*.jarwith 3.7.0-SNAPSHOT artifacts and updatesbuild.gradle/core/build.gradle/plugin/build.gradlereferences.Notes
files()references so CI does not needpublishToMavenLocal.Test plan
./gradlew build -x integTestpasses locally