From e9169368d4eab5acf2d11b302f12ff35bd74f6f4 Mon Sep 17 00:00:00 2001 From: bowenlan-amzn Date: Tue, 5 May 2026 15:08:12 -0700 Subject: [PATCH] Bundle patched Calcite (1.41.0-opensearch-1) into analytics-engine MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Calcite hardcodes Janino's parent classloader, which breaks UDF resolution inside OpenSearch's plugin classloader hierarchy (CALCITE-3745). The fix requires a patched calcite-core / calcite-linq4j, but the patch only affects runtime classloader behavior — API surface, bytecode references, and license metadata are identical to vanilla. The patched jars are published at https://ci.opensearch.org/ci/dbc/snapshots/maven/ as org.apache.calcite:calcite-core:1.41.0-opensearch-1 (and calcite-linq4j). This change wires analytics-framework to consume that coordinate directly: - analytics-framework declares `api "org.apache.calcite:calcite-core:1.41.0-opensearch-1"` plus the OpenSearch Snapshots Maven repo. The patched jars flow through runtimeClasspath of every consumer (analytics-engine, downstream plugins) with no bespoke swap logic. - analytics-engine adds a resolutionStrategy.force for calcite-core and calcite-linq4j so unified-query-*'s transitive vanilla 1.41.0 reference (via calcite-babel) snaps to 1.41.0-opensearch-1, keeping a single Calcite on the classpath. - License SHA-1 files under sandbox/libs/analytics-framework/licenses/ carry the opensearch-1 coordinate. No changes to runtimeClasspath shape, no post-processing of the bundlePlugin Zip task — the patched artifact is just a dependency like any other. compileJava, test, forbiddenApis, thirdPartyAudit, dependencyLicenses all see the same jars the zip ships. Signed-off-by: bowenlan-amzn --- sandbox/build.gradle | 25 +++ sandbox/libs/analytics-framework/build.gradle | 6 +- .../calcite-core-1.41.0-opensearch-1.jar.sha1 | 1 + .../licenses/calcite-core-1.41.0.jar.sha1 | 1 - ...alcite-linq4j-1.41.0-opensearch-1.jar.sha1 | 1 + .../licenses/calcite-linq4j-1.41.0.jar.sha1 | 1 - sandbox/plugins/analytics-engine/build.gradle | 12 +- .../licenses/commons-text-1.11.0.jar.sha1 | 1 + .../licenses/commons-text-LICENSE.txt | 202 ++++++++++++++++++ .../licenses/commons-text-NOTICE.txt | 5 + 10 files changed, 245 insertions(+), 10 deletions(-) create mode 100644 sandbox/libs/analytics-framework/licenses/calcite-core-1.41.0-opensearch-1.jar.sha1 delete mode 100644 sandbox/libs/analytics-framework/licenses/calcite-core-1.41.0.jar.sha1 create mode 100644 sandbox/libs/analytics-framework/licenses/calcite-linq4j-1.41.0-opensearch-1.jar.sha1 delete mode 100644 sandbox/libs/analytics-framework/licenses/calcite-linq4j-1.41.0.jar.sha1 create mode 100644 sandbox/plugins/analytics-engine/licenses/commons-text-1.11.0.jar.sha1 create mode 100644 sandbox/plugins/analytics-engine/licenses/commons-text-LICENSE.txt create mode 100644 sandbox/plugins/analytics-engine/licenses/commons-text-NOTICE.txt diff --git a/sandbox/build.gradle b/sandbox/build.gradle index d98658d071941..4a14d0a11a0d7 100644 --- a/sandbox/build.gradle +++ b/sandbox/build.gradle @@ -7,6 +7,7 @@ */ import org.gradle.api.publish.plugins.PublishingPlugin +import org.opensearch.gradle.VersionProperties /** * This module provides a space in OpenSearch for the community to easily experiment with new ideas and innovate. @@ -32,9 +33,33 @@ import org.gradle.api.publish.plugins.PublishingPlugin */ def sandboxEnabled = System.getProperty("sandbox.enabled", "false") == "true" +// Patched Calcite coordinate, composed from libs.versions.toml keys. +// Pinned here once so every sandbox subproject can resolve it without +// duplicating the repo + force declaration. +def libVersions = VersionProperties.getVersions() +def patchedCalciteVersion = "${libVersions['calcite']}-opensearch-${libVersions['calcite_os_rev']}" + subprojects { group = 'org.opensearch.sandbox' + // The patched calcite-core / calcite-linq4j live in the OpenSearch + // snapshots Maven repo; analytics-framework advertises them as `api`, + // so every consumer of analytics-framework needs both the repo and a + // `force` to win over transitive vanilla calcite + repositories { + maven { + name = 'OpenSearch Snapshots' + url = 'https://ci.opensearch.org/ci/dbc/snapshots/maven/' + } + } + + configurations.all { + resolutionStrategy { + force "org.apache.calcite:calcite-core:${patchedCalciteVersion}" + force "org.apache.calcite:calcite-linq4j:${patchedCalciteVersion}" + } + } + if (sandboxEnabled == false) { afterEvaluate { tasks.configureEach { task -> diff --git a/sandbox/libs/analytics-framework/build.gradle b/sandbox/libs/analytics-framework/build.gradle index af29a627a1b0f..f22f55e23cb53 100644 --- a/sandbox/libs/analytics-framework/build.gradle +++ b/sandbox/libs/analytics-framework/build.gradle @@ -12,7 +12,11 @@ * Plugins depend on this; the /modules SPI layer does NOT. */ -def calciteVersion = '1.41.0' +// Patched Calcite coordinate. Carries CALCITE-3745 (TCCL-chained classloader +// for Janino parent CL); API surface is identical to upstream. The OpenSearch +// Snapshots repo and the resolutionStrategy.force for this coordinate are +// declared centrally in sandbox/build.gradle's subprojects block. +def calciteVersion = "${versions.calcite}-opensearch-${versions.calcite_os_rev}" java { sourceCompatibility = JavaVersion.toVersion(25); targetCompatibility = JavaVersion.toVersion(25) } diff --git a/sandbox/libs/analytics-framework/licenses/calcite-core-1.41.0-opensearch-1.jar.sha1 b/sandbox/libs/analytics-framework/licenses/calcite-core-1.41.0-opensearch-1.jar.sha1 new file mode 100644 index 0000000000000..a2c7251e69f38 --- /dev/null +++ b/sandbox/libs/analytics-framework/licenses/calcite-core-1.41.0-opensearch-1.jar.sha1 @@ -0,0 +1 @@ +d4ac2aff0c76b2ea15f47940542999fa42e17d75 \ No newline at end of file diff --git a/sandbox/libs/analytics-framework/licenses/calcite-core-1.41.0.jar.sha1 b/sandbox/libs/analytics-framework/licenses/calcite-core-1.41.0.jar.sha1 deleted file mode 100644 index 58d7801dd6bca..0000000000000 --- a/sandbox/libs/analytics-framework/licenses/calcite-core-1.41.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -0dd7b4be638f0cea174f78cc851322b64d813a1e diff --git a/sandbox/libs/analytics-framework/licenses/calcite-linq4j-1.41.0-opensearch-1.jar.sha1 b/sandbox/libs/analytics-framework/licenses/calcite-linq4j-1.41.0-opensearch-1.jar.sha1 new file mode 100644 index 0000000000000..ffea6f5d715f8 --- /dev/null +++ b/sandbox/libs/analytics-framework/licenses/calcite-linq4j-1.41.0-opensearch-1.jar.sha1 @@ -0,0 +1 @@ +e9bcb0ec7ca38a4bff84283b39d4a736c5217645 \ No newline at end of file diff --git a/sandbox/libs/analytics-framework/licenses/calcite-linq4j-1.41.0.jar.sha1 b/sandbox/libs/analytics-framework/licenses/calcite-linq4j-1.41.0.jar.sha1 deleted file mode 100644 index fd7c6e8a06cf2..0000000000000 --- a/sandbox/libs/analytics-framework/licenses/calcite-linq4j-1.41.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -dd399fb76918f6f688b458da2f1c8dd7fc07e3f8 \ No newline at end of file diff --git a/sandbox/plugins/analytics-engine/build.gradle b/sandbox/plugins/analytics-engine/build.gradle index 346aa1385ad70..5f7986c74a2cf 100644 --- a/sandbox/plugins/analytics-engine/build.gradle +++ b/sandbox/plugins/analytics-engine/build.gradle @@ -28,13 +28,6 @@ opensearchplugin { java { sourceCompatibility = JavaVersion.toVersion(25); targetCompatibility = JavaVersion.toVersion(25) } -repositories { - maven { - name = 'OpenSearch Snapshots' - url = 'https://ci.opensearch.org/ci/dbc/snapshots/maven/' - } -} - // Guava comes transitively from calcite-core and unified-query — forbidden on // compile classpaths by OpenSearch. Main sources don't need it; test sources do // (Calcite API exposes ImmutableList, Predicate). Bypass via custom config. @@ -110,6 +103,11 @@ dependencies { // so bundle it into analytics-engine's own zip. runtimeOnly "org.apache.commons:commons-math3:3.6.1" + // commons-text — Calcite's SqlFunctions. references + // org.apache.commons.text.similarity.LevenshteinDistance. Must be loaded via + // the same classloader as calcite-core so that succeeds. + runtimeOnly "org.apache.commons:commons-text:1.11.0" + // httpcore5/httpclient5 — Avatica's BuiltInConnectionProperty static initializer references // org.apache.hc.core5.util.Timeout. Not provided by arrow-flight-rpc, so bundle here. runtimeOnly "org.apache.httpcomponents.core5:httpcore5:${versions.httpcore5}" diff --git a/sandbox/plugins/analytics-engine/licenses/commons-text-1.11.0.jar.sha1 b/sandbox/plugins/analytics-engine/licenses/commons-text-1.11.0.jar.sha1 new file mode 100644 index 0000000000000..6f090739df8c6 --- /dev/null +++ b/sandbox/plugins/analytics-engine/licenses/commons-text-1.11.0.jar.sha1 @@ -0,0 +1 @@ +2bb044b7717ec2eccaf9ea7769c1509054b50e9a \ No newline at end of file diff --git a/sandbox/plugins/analytics-engine/licenses/commons-text-LICENSE.txt b/sandbox/plugins/analytics-engine/licenses/commons-text-LICENSE.txt new file mode 100644 index 0000000000000..d645695673349 --- /dev/null +++ b/sandbox/plugins/analytics-engine/licenses/commons-text-LICENSE.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/sandbox/plugins/analytics-engine/licenses/commons-text-NOTICE.txt b/sandbox/plugins/analytics-engine/licenses/commons-text-NOTICE.txt new file mode 100644 index 0000000000000..a4c26c8b77307 --- /dev/null +++ b/sandbox/plugins/analytics-engine/licenses/commons-text-NOTICE.txt @@ -0,0 +1,5 @@ +Apache Commons Text +Copyright 2014-2023 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (https://www.apache.org/).