Skip to content

Commit fc3d795

Browse files
ahkcsdai-chen
authored andcommitted
Version bump to OpenSearch 3.7 with async QueryPlanExecutor (opensearch-project#5396)
* Version bump to OpenSearch 3.7 (Jackson 2 → 3 parser API + _source excludes serialization) (opensearch-project#5361) Signed-off-by: Kai Huang <ahkcs@amazon.com> * Update vendored analytics JARs from 3.6 to 3.7 Replace libs/ JARs with 3.7.0-SNAPSHOT versions built from the OpenSearch sandbox. Update build files to reference 3.7 file names. Keep files() references instead of Maven coordinates so CI can resolve dependencies without publishToMavenLocal. Signed-off-by: Ahmed Khatib <ahkcs@amazon.com> Signed-off-by: Kai Huang <ahkcs@amazon.com> * Async QueryPlanExecutor + drop stub and stub-only ITs The analytics-framework 3.7 QueryPlanExecutor interface is async (void execute(plan, ctx, ActionListener<Stream>)). Update AnalyticsExecutionEngine to dispatch via the listener instead of the old synchronous return-value form, and rework the unit test mocks likewise. Drop StubQueryPlanExecutor and its callers (TransportPPLQueryAction, SQLPlugin, RestUnifiedQueryActionTest); the SQL plugin now expects the real analytics-engine executor to be supplied via Guice cross-plugin injection (a small AnalyticsExecutorHolder bridges the binding to the SQLPlugin REST handler that runs before Node injection). Drop AnalyticsPPLIT and AnalyticsExplainIT (and their expectedOutput/analytics fixtures): these tested stub canned data which no longer exists. Signed-off-by: Kai Huang <ahkcs@amazon.com> --------- Signed-off-by: Kai Huang <ahkcs@amazon.com> Signed-off-by: Ahmed Khatib <ahkcs@amazon.com>
1 parent 62c6a7e commit fc3d795

21 files changed

Lines changed: 6 additions & 593 deletions

build.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,11 @@ allprojects {
127127
version += "-SNAPSHOT"
128128
}
129129

130+
// Path to the analytics-engine plugin ZIP. Override with
131+
// `-PanalyticsEngineZip=/path/to/zip` if needed.
132+
ext.analyticsEngineZip = project.findProperty('analyticsEngineZip') ?:
133+
"${rootDir}/libs/analytics-engine-3.7.0-SNAPSHOT.zip"
134+
130135
plugins.withId('java') {
131136
java {
132137
sourceCompatibility = JavaVersion.VERSION_21

doctest/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ testClusters {
195195
}))
196196
*/
197197
plugin(getJobSchedulerPlugin(jsPlugin, bwcOpenSearchJSDownload))
198-
plugin provider { (RegularFile) (() -> file("${rootDir}/libs/analytics-engine-3.6.0-SNAPSHOT.zip")) }
198+
plugin provider { (RegularFile) (() -> file("${rootDir}/libs/analytics-engine-3.7.0-SNAPSHOT.zip")) }
199199
plugin ':opensearch-sql-plugin'
200200
testDistribution = 'archive'
201201
}

integ-test/src/test/java/org/opensearch/sql/ppl/AnalyticsExplainIT.java

Lines changed: 0 additions & 94 deletions
This file was deleted.

integ-test/src/test/java/org/opensearch/sql/ppl/AnalyticsPPLIT.java

Lines changed: 0 additions & 223 deletions
This file was deleted.

0 commit comments

Comments
 (0)