Move the arrow-memory-shaded and flight within flight-rpc plugin

Signed-off-by: Rishabh Maurya <[email protected]>
rishabhmaurya · Jan 28, 2025 · afea399 · afea399
1 parent 126f8f0
commit afea399
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 18 deletions.
diff --git a/libs/arrow-spi/build.gradle b/libs/arrow-spi/build.gradle
@@ -13,7 +13,9 @@ testingConventions.enabled = false
 
 dependencies {
   api project(':libs:opensearch-core')
-  api project(path:':libs:opensearch-arrow-memory-shaded', configuration: 'shadow')
+  api "org.apache.arrow:arrow-vector:${versions.arrow}"
+  api "org.apache.arrow:arrow-memory-core:${versions.arrow}"
+  api 'org.checkerframework:checker-qual:3.44.0'
 }
 
 tasks.named('forbiddenApisMain').configure {

diff --git a/plugins/arrow-flight-rpc/arrow-memory-shaded/build.gradle b/plugins/arrow-flight-rpc/arrow-memory-shaded/build.gradle
@@ -7,6 +7,7 @@
  */
 
 plugins {
+  id 'opensearch.build'
   id("com.gradleup.shadow")
 }
 
@@ -18,14 +19,14 @@ generatePomFileForShadowPublication.enabled = false
 
 dependencies {
   runtimeOnly "org.apache.arrow:arrow-memory-netty:${versions.arrow}"
-  runtimeOnly "org.apache.arrow:arrow-memory-core:${versions.arrow}"
+  //runtimeOnly "org.apache.arrow:arrow-memory-core:${versions.arrow}"
   runtimeOnly "org.apache.arrow:arrow-memory-netty-buffer-patch:${versions.arrow}"
   runtimeOnly "io.netty:netty-buffer:${versions.netty}"
   runtimeOnly "io.netty:netty-common:${versions.netty}"
-  runtimeOnly "org.apache.arrow:arrow-vector:${versions.arrow}"
+  // runtimeOnly "org.apache.arrow:arrow-vector:${versions.arrow}"
   runtimeOnly "org.apache.arrow:arrow-format:${versions.arrow}"
 
-  runtimeOnly 'org.checkerframework:checker-qual:3.44.0'
+  // runtimeOnly 'org.checkerframework:checker-qual:3.44.0'
   runtimeOnly "com.google.flatbuffers:flatbuffers-java:${versions.flatbuffers}"
   runtimeOnly "org.slf4j:slf4j-api:${versions.slf4j}"
   runtimeOnly "com.fasterxml.jackson.core:jackson-core:${versions.jackson}"

diff --git a/plugins/arrow-flight-rpc/build.gradle b/plugins/arrow-flight-rpc/build.gradle
@@ -18,7 +18,9 @@ opensearchplugin {
 
 dependencies {
   implementation project(':libs:opensearch-arrow-spi')
-  implementation project(path:':libs:opensearch-flight-core-shaded', configuration: 'shadow')
+  implementation project(path:':plugins:arrow-flight-rpc:arrow-memory-shaded', configuration: 'shadow')
+  implementation project(path:':plugins:arrow-flight-rpc:flight-core-shaded', configuration: 'shadow')
+
   implementation "io.grpc:grpc-netty-shaded:${versions.grpc}"
 
   implementation "io.grpc:grpc-api:${versions.grpc}"

diff --git a/plugins/arrow-flight-rpc/flight-core-shaded/build.gradle b/plugins/arrow-flight-rpc/flight-core-shaded/build.gradle
@@ -10,6 +10,7 @@
  */
 
 plugins {
+  id 'opensearch.build'
   id("com.gradleup.shadow")
 }
 

diff --git a/plugins/arrow-flight-rpc/src/main/plugin-metadata/plugin-security.policy b/plugins/arrow-flight-rpc/src/main/plugin-metadata/plugin-security.policy
@@ -6,6 +6,18 @@
  * compatible open source license.
  */
 
+grant codeBase "${codebase.arrow-flight-rpc:arrow-memory-shaded}" {
+    permission java.lang.RuntimePermission "modifyThreadGroup";
+    permission java.lang.RuntimePermission "modifyThread";
+
+    // Reflection access needed by Arrow
+    permission java.lang.RuntimePermission "accessDeclaredMembers";
+    permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
+
+    // Memory access
+    permission java.lang.RuntimePermission "accessClassInPackage.sun.misc";
+};
+
 grant codeBase "${codebase.grpc-netty-shaded}" {
    permission java.net.SocketPermission "*", "accept,connect,listen,resolve";
    permission java.lang.RuntimePermission "*", "setContextClassLoader";
@@ -16,7 +28,7 @@ grant codeBase "${codebase.grpc-core}" {
    permission java.lang.RuntimePermission "*", "setContextClassLoader";
 };
 
-grant codeBase "${codebase.arrow-flight-rpc}" {
+grant {
   // arrow flight service permissions
   permission java.util.PropertyPermission "arrow.allocation.manager.type", "write";
   permission java.util.PropertyPermission "arrow.enable_null_check_for_get", "write";

diff --git a/plugins/arrow-flight-rpc/src/test/resources/org/opensearch/bootstrap/test.policy b/plugins/arrow-flight-rpc/src/test/resources/org/opensearch/bootstrap/test.policy
@@ -6,6 +6,19 @@
  * compatible open source license.
  */
 
+grant codeBase "${codebase.arrow-flight-rpc:arrow-memory-shaded}" {
+    permission java.lang.RuntimePermission "modifyThreadGroup";
+    permission java.lang.RuntimePermission "modifyThread";
+
+    // Reflection access needed by Arrow
+    permission java.lang.RuntimePermission "accessDeclaredMembers";
+    permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
+
+    // Memory access
+    permission java.lang.RuntimePermission "accessClassInPackage.sun.misc";
+    permission java.util.PropertyPermission "arrow.allocation.manager.type", "write";
+};
+
 grant codeBase "${codebase.grpc-netty-shaded}" {
    permission java.net.SocketPermission "*", "accept,connect,listen,resolve";
    permission java.lang.RuntimePermission "*", "setContextClassLoader";

diff --git a/server/src/main/resources/org/opensearch/bootstrap/security.policy b/server/src/main/resources/org/opensearch/bootstrap/security.policy
@@ -92,18 +92,6 @@ grant codeBase "${codebase.reactor-core}" {
   permission java.net.SocketPermission "*", "connect,resolve";
 };
 
-grant codeBase "${codebase.opensearch-arrow-memory-shaded}" {
-    permission java.lang.RuntimePermission "modifyThreadGroup";
-    permission java.lang.RuntimePermission "modifyThread";
-
-    // Reflection access needed by Arrow
-    permission java.lang.RuntimePermission "accessDeclaredMembers";
-    permission java.lang.reflect.ReflectPermission "suppressAccessChecks";
-
-    // Memory access
-    permission java.lang.RuntimePermission "accessClassInPackage.sun.misc";
-};
-
 //// Everything else:
 
 grant {
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,6 +10,7 @@ @@
      */
     plugins {
+      id 'opensearch.build'
       id("com.gradleup.shadow")
     }
@@ Expand Down @@