* BatchedJob supports streaming of intermediate results, allowing consumers to begin processing data before the entire * result set is generated. This is particularly useful for memory-intensive operations or when dealing with large datasets @@ -74,7 +74,7 @@ * * @see StreamManager * @see StreamTicket - * @see StreamIterator + * @see StreamReader */ @ExperimentalApi public interface StreamProducer extends Closeable { diff --git a/libs/arrow-spi/src/main/java/org/opensearch/arrow/spi/StreamReader.java b/libs/arrow-spi/src/main/java/org/opensearch/arrow/spi/StreamReader.java new file mode 100644 index 0000000000000..7163bd3fe939f --- /dev/null +++ b/libs/arrow-spi/src/main/java/org/opensearch/arrow/spi/StreamReader.java @@ -0,0 +1,56 @@ +/* + * SPDX-License-Identifier: Apache-2.0 + * + * The OpenSearch Contributors require contributions made to + * this file be licensed under the Apache-2.0 license or a + * compatible open source license. + */ + +package org.opensearch.arrow.spi; + +import org.apache.arrow.vector.VectorSchemaRoot; +import org.opensearch.common.annotation.ExperimentalApi; + +import java.io.Closeable; + +/** + * StreamReader is a stateful iterator that can be used to read data from a stream. + * It is used to read data from a stream in batches. The iterator will return a + * VectorSchemaRoot that contains the data for the current batch. The iterator will + * return true if there is more data to read, false if the stream is exhausted. + * Example usage: + *
{@code
+ * // producer
+ * StreamProducer producer = new QueryStreamProducer(searchRequest);
+ * StreamTicket ticket = streamManager.registerStream(producer, taskId);
+ *
+ * // consumer
+ * StreamIterator iterator = streamManager.getStreamIterator(ticket);
+ * try (VectorSchemaRoot root = iterator.getRoot()) {
+ * while (iterator.next()) {
+ * VarCharVector idVector = (VarCharVector)root.getVector("id");
+ * Float8Vector scoreVector = (Float8Vector) root.getVector("score");
+ * }
+ * }
+ * }
+ *
+ * @see StreamProducer
+ */
+@ExperimentalApi
+public interface StreamReader extends Closeable {
+
+ /**
+ * Blocking request to load next batch into root.
+ *
+ * @return true if more data was found, false if the stream is exhausted
+ */
+ boolean next();
+
+ /**
+ * Returns the VectorSchemaRoot associated with this iterator.
+ * The content of this root is updated with each successful call to next().
+ *
+ * @return the VectorSchemaRoot
+ */
+ VectorSchemaRoot getRoot();
+}
diff --git a/libs/arrow/src/main/java/org/opensearch/arrow/StreamTicket.java b/libs/arrow-spi/src/main/java/org/opensearch/arrow/spi/StreamTicket.java
similarity index 99%
rename from libs/arrow/src/main/java/org/opensearch/arrow/StreamTicket.java
rename to libs/arrow-spi/src/main/java/org/opensearch/arrow/spi/StreamTicket.java
index 556e966b74bd7..e771744d08bff 100644
--- a/libs/arrow/src/main/java/org/opensearch/arrow/StreamTicket.java
+++ b/libs/arrow-spi/src/main/java/org/opensearch/arrow/spi/StreamTicket.java
@@ -6,7 +6,7 @@
* compatible open source license.
*/
-package org.opensearch.arrow;
+package org.opensearch.arrow.spi;
import org.opensearch.common.annotation.ExperimentalApi;
diff --git a/libs/arrow/src/main/java/org/opensearch/arrow/package-info.java b/libs/arrow-spi/src/main/java/org/opensearch/arrow/spi/package-info.java
similarity index 89%
rename from libs/arrow/src/main/java/org/opensearch/arrow/package-info.java
rename to libs/arrow-spi/src/main/java/org/opensearch/arrow/spi/package-info.java
index 5ead90e2d25c0..d075ecaa764bb 100644
--- a/libs/arrow/src/main/java/org/opensearch/arrow/package-info.java
+++ b/libs/arrow-spi/src/main/java/org/opensearch/arrow/spi/package-info.java
@@ -9,4 +9,4 @@
/**
* Contains Apache Arrow related classes and Stream generic interfaces
*/
-package org.opensearch.arrow;
+package org.opensearch.arrow.spi;
diff --git a/libs/arrow/src/test/java/org/opensearch/arrow/StreamTicketTests.java b/libs/arrow-spi/src/test/java/org/opensearch/arrow/spi/StreamTicketTests.java
similarity index 99%
rename from libs/arrow/src/test/java/org/opensearch/arrow/StreamTicketTests.java
rename to libs/arrow-spi/src/test/java/org/opensearch/arrow/spi/StreamTicketTests.java
index 0f86240696e05..15505c8477200 100644
--- a/libs/arrow/src/test/java/org/opensearch/arrow/StreamTicketTests.java
+++ b/libs/arrow-spi/src/test/java/org/opensearch/arrow/spi/StreamTicketTests.java
@@ -6,7 +6,7 @@
* compatible open source license.
*/
-package org.opensearch.arrow;
+package org.opensearch.arrow.spi;
import org.opensearch.test.OpenSearchTestCase;
diff --git a/libs/arrow/build.gradle b/libs/arrow/build.gradle
deleted file mode 100644
index ba47279afac0e..0000000000000
--- a/libs/arrow/build.gradle
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- *
- * The OpenSearch Contributors require contributions made to
- * this file be licensed under the Apache-2.0 license or a
- * compatible open source license.
- *
- * Modifications Copyright OpenSearch Contributors. See
- * GitHub history for details.
- */
-
-dependencies {
- implementation project(':libs:opensearch-common')
- implementation project(':libs:opensearch-core')
- api "org.apache.arrow:arrow-vector:${versions.arrow}"
- api "org.apache.arrow:arrow-format:${versions.arrow}"
- api "org.apache.arrow:arrow-memory-core:${versions.arrow}"
- runtimeOnly "org.apache.arrow:arrow-memory-netty-buffer-patch:${versions.arrow}"
- runtimeOnly "org.apache.arrow:arrow-memory-netty:${versions.arrow}"
- runtimeOnly "io.netty:netty-buffer:${versions.netty}"
- runtimeOnly "io.netty:netty-common:${versions.netty}"
-
- runtimeOnly "com.google.flatbuffers:flatbuffers-java:${versions.flatbuffers}"
- implementation "org.slf4j:slf4j-api:${versions.slf4j}"
- implementation "com.fasterxml.jackson.core:jackson-core:${versions.jackson}"
- implementation "com.fasterxml.jackson.core:jackson-databind:${versions.jackson}"
- implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${versions.jackson}"
- implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${versions.jackson}"
- api "com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}"
-
- implementation "commons-codec:commons-codec:${versions.commonscodec}"
-
- // third party audit missing classes and violations
- implementation "org.slf4j:slf4j-api:${versions.slf4j}"
- implementation "org.apache.logging.log4j:log4j-api:${versions.log4j}"
- implementation "org.apache.logging.log4j:log4j-core:${versions.log4j}"
- implementation "org.apache.logging.log4j:log4j-slf4j-impl:${versions.log4j}"
- implementation "org.yaml:snakeyaml:${versions.snakeyaml}"
- implementation "io.projectreactor.tools:blockhound:1.0.9.RELEASE"
-
- testImplementation "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}"
- testImplementation "junit:junit:${versions.junit}"
- testImplementation "org.hamcrest:hamcrest:${versions.hamcrest}"
- testImplementation(project(":test:framework")) {
- exclude group: 'org.opensearch', module: 'opensearch-arrow'
- }
-}
-
-tasks.named('forbiddenApisMain').configure {
- replaceSignatureFiles 'jdk-signatures'
-}
-
-tasks.named('thirdPartyAudit').configure {
- ignoreMissingClasses(
- "com.conversantmedia.util.concurrent.SpinPolicy",
- "com.fasterxml.jackson.dataformat.xml.JacksonXmlModule",
- "com.fasterxml.jackson.dataformat.xml.XmlMapper",
- "com.fasterxml.jackson.dataformat.xml.util.DefaultXmlPrettyPrinter",
- "com.lmax.disruptor.EventFactory",
- "com.lmax.disruptor.EventTranslator",
- "com.lmax.disruptor.EventTranslatorTwoArg",
- "com.lmax.disruptor.EventTranslatorVararg",
- "com.lmax.disruptor.ExceptionHandler",
- "com.lmax.disruptor.LifecycleAware",
- "com.lmax.disruptor.RingBuffer",
- "com.lmax.disruptor.Sequence",
- "com.lmax.disruptor.SequenceBarrier",
- "com.lmax.disruptor.SequenceReportingEventHandler",
- "com.lmax.disruptor.TimeoutException",
- "com.lmax.disruptor.WaitStrategy",
- "com.lmax.disruptor.dsl.Disruptor",
- "com.lmax.disruptor.dsl.ProducerType",
- "com.sun.jna.FunctionMapper",
- "com.sun.jna.JNIEnv",
- "com.sun.jna.Library",
- "com.sun.jna.Memory",
- "com.sun.jna.Native",
- "com.sun.jna.NativeLibrary",
- "com.sun.jna.Platform",
- "com.sun.jna.Pointer",
- "com.sun.jna.Structure",
- "com.sun.jna.platform.win32.Advapi32",
- "com.sun.jna.platform.win32.Kernel32",
- "com.sun.jna.platform.win32.WinBase\$SECURITY_ATTRIBUTES",
- "com.sun.jna.platform.win32.WinDef\$DWORD",
- "com.sun.jna.platform.win32.WinDef\$LPVOID",
- "com.sun.jna.platform.win32.WinNT\$HANDLE",
- "com.sun.jna.platform.win32.WinNT\$SECURITY_DESCRIPTOR",
- "com.sun.jna.ptr.IntByReference",
- "com.sun.jna.win32.StdCallLibrary",
- "com.sun.jna.win32.W32APIOptions",
- "io.reactivex.internal.schedulers.NonBlockingThread",
- "javax.jms.Connection",
- "javax.jms.ConnectionFactory",
- "javax.jms.Destination",
- "javax.jms.JMSException",
- "javax.jms.MapMessage",
- "javax.jms.Message",
- "javax.jms.MessageConsumer",
- "javax.jms.MessageProducer",
- "javax.jms.Session",
- "javax.mail.Authenticator",
- "javax.mail.Message\$RecipientType",
- "javax.mail.PasswordAuthentication",
- "javax.mail.Session",
- "javax.mail.Transport",
- "javax.mail.internet.InternetAddress",
- "javax.mail.internet.InternetHeaders",
- "javax.mail.internet.MimeMessage",
- "javax.mail.internet.MimeMultipart",
- "javax.mail.internet.MimeUtility",
- "org.apache.commons.compress.compressors.CompressorStreamFactory",
- "org.apache.commons.compress.utils.IOUtils",
- "org.apache.commons.csv.CSVFormat",
- "org.apache.commons.csv.QuoteMode",
- "org.apache.commons.logging.Log",
- "org.apache.commons.logging.LogFactory",
- "org.apache.kafka.clients.producer.Producer",
- "org.apache.kafka.clients.producer.RecordMetadata",
- "org.apache.kafka.common.serialization.ByteArraySerializer",
- "org.apache.log4j.Level",
- "org.apache.log4j.Logger",
- "org.codehaus.stax2.XMLStreamWriter2",
- "org.fusesource.jansi.Ansi",
- "org.fusesource.jansi.AnsiRenderer\$Code",
- "org.jctools.queues.MpscArrayQueue",
- "org.osgi.framework.Bundle",
- "org.osgi.framework.BundleActivator",
- "org.osgi.framework.BundleContext",
- "org.osgi.framework.BundleEvent",
- "org.osgi.framework.BundleReference",
- "org.osgi.framework.FrameworkUtil",
- "org.osgi.framework.ServiceReference",
- "org.osgi.framework.ServiceRegistration",
- "org.osgi.framework.SynchronousBundleListener",
- "org.osgi.framework.wiring.BundleWire",
- "org.osgi.framework.wiring.BundleWiring",
- "org.slf4j.ext.EventData",
- "org.zeromq.SocketType",
- "org.zeromq.ZContext",
- "org.zeromq.ZMQ",
- "org.zeromq.ZMQ\$Context",
- "org.zeromq.ZMQ\$Socket",
- "org.zeromq.ZMonitor",
- "org.zeromq.ZMonitor\$Event",
- "org.zeromq.ZMonitor\$ZEvent",
- "reactor.core.scheduler.NonBlocking"
- )
-
- ignoreViolations(
- "io.netty.util.internal.PlatformDependent0",
- "io.netty.util.internal.PlatformDependent0\$1",
- "io.netty.util.internal.PlatformDependent0\$2",
- "io.netty.util.internal.PlatformDependent0\$3",
- "io.netty.util.internal.PlatformDependent0\$4",
- "io.netty.util.internal.PlatformDependent0\$6",
- "io.netty.util.internal.shaded.org.jctools.queues.BaseLinkedQueueConsumerNodeRef",
- "io.netty.util.internal.shaded.org.jctools.queues.BaseLinkedQueueProducerNodeRef",
- "io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueueColdProducerFields",
- "io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueueConsumerFields",
- "io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueueProducerFields",
- "io.netty.util.internal.shaded.org.jctools.queues.LinkedQueueNode",
- "io.netty.util.internal.shaded.org.jctools.queues.MpmcArrayQueueConsumerIndexField",
- "io.netty.util.internal.shaded.org.jctools.queues.MpmcArrayQueueProducerIndexField",
- "io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueConsumerIndexField",
- "io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueProducerIndexField",
- "io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueProducerLimitField",
- "io.netty.util.internal.shaded.org.jctools.util.UnsafeAccess",
- "io.netty.util.internal.shaded.org.jctools.util.UnsafeLongArrayAccess",
- "io.netty.util.internal.shaded.org.jctools.util.UnsafeRefArrayAccess",
- "io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueConsumerIndexField",
- "io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueProducerIndexField",
- "io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueProducerLimitField",
- "org.apache.arrow.memory.ArrowBuf",
- "org.apache.arrow.memory.util.ByteFunctionHelpers",
- "org.apache.arrow.memory.util.MemoryUtil",
- "org.apache.arrow.memory.util.MemoryUtil\$1",
- "org.apache.arrow.memory.util.hash.MurmurHasher",
- "org.apache.arrow.memory.util.hash.SimpleHasher",
- "org.apache.arrow.vector.BaseFixedWidthVector",
- "org.apache.arrow.vector.BitVectorHelper",
- "org.apache.arrow.vector.Decimal256Vector",
- "org.apache.arrow.vector.DecimalVector",
- "org.apache.arrow.vector.util.DecimalUtility",
- "org.apache.arrow.vector.util.VectorAppender",
- "org.apache.logging.log4j.core.util.internal.UnsafeUtil",
- "org.apache.logging.log4j.core.util.internal.UnsafeUtil\$1"
- )
-}
diff --git a/libs/arrow/licenses/blockhound-1.0.9.RELEASE.jar.sha1 b/libs/arrow/licenses/blockhound-1.0.9.RELEASE.jar.sha1
deleted file mode 100644
index 3c7e245865aa9..0000000000000
--- a/libs/arrow/licenses/blockhound-1.0.9.RELEASE.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-0e334925a6833d6478c90578711d546e248d9ce1
\ No newline at end of file
diff --git a/libs/arrow/licenses/blockhound-LICENSE.txt b/libs/arrow/licenses/blockhound-LICENSE.txt
deleted file mode 100644
index 20e4bd85661f5..0000000000000
--- a/libs/arrow/licenses/blockhound-LICENSE.txt
+++ /dev/null
@@ -1,201 +0,0 @@
- Apache License
- Version 2.0, January 2004
- https://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
-
- https://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/libs/arrow/licenses/blockhound-NOTICE.txt b/libs/arrow/licenses/blockhound-NOTICE.txt
deleted file mode 100644
index e69de29bb2d1d..0000000000000
diff --git a/libs/arrow/licenses/log4j-api-2.21.0.jar.sha1 b/libs/arrow/licenses/log4j-api-2.21.0.jar.sha1
deleted file mode 100644
index 51446052594aa..0000000000000
--- a/libs/arrow/licenses/log4j-api-2.21.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-760192f2b69eacf4a4afc78e5a1d7a8de054fcbd
\ No newline at end of file
diff --git a/libs/arrow/licenses/log4j-api-LICENSE.txt b/libs/arrow/licenses/log4j-api-LICENSE.txt
deleted file mode 100644
index 6279e5206de13..0000000000000
--- a/libs/arrow/licenses/log4j-api-LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
- 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 1999-2005 The Apache Software Foundation
-
- 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/libs/arrow/licenses/log4j-api-NOTICE.txt b/libs/arrow/licenses/log4j-api-NOTICE.txt
deleted file mode 100644
index 0c37b52bfe7ad..0000000000000
--- a/libs/arrow/licenses/log4j-api-NOTICE.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-Apache Log4j
-Copyright 1999-2024 Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-ResolverUtil.java
-Copyright 2005-2006 Tim Fennell
-
-Dumbster SMTP test server
-Copyright 2004 Jason Paul Kitchen
-
-TypeUtil.java
-Copyright 2002-2012 Ramnivas Laddad, Juergen Hoeller, Chris Beams
-
-picocli (http://picocli.info)
-Copyright 2017 Remko Popma
-
-TimeoutBlockingWaitStrategy.java and parts of Util.java
-Copyright 2011 LMAX Ltd.
diff --git a/libs/arrow/licenses/log4j-core-2.21.0.jar.sha1 b/libs/arrow/licenses/log4j-core-2.21.0.jar.sha1
deleted file mode 100644
index c88e6f7a25ca9..0000000000000
--- a/libs/arrow/licenses/log4j-core-2.21.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-122e1a9e0603cc9eae07b0846a6ff01f2454bc49
\ No newline at end of file
diff --git a/libs/arrow/licenses/log4j-core-LICENSE.txt b/libs/arrow/licenses/log4j-core-LICENSE.txt
deleted file mode 100644
index 6279e5206de13..0000000000000
--- a/libs/arrow/licenses/log4j-core-LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
- 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 1999-2005 The Apache Software Foundation
-
- 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/libs/arrow/licenses/log4j-core-NOTICE.txt b/libs/arrow/licenses/log4j-core-NOTICE.txt
deleted file mode 100644
index 0375732360047..0000000000000
--- a/libs/arrow/licenses/log4j-core-NOTICE.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Apache log4j
-Copyright 2007 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
\ No newline at end of file
diff --git a/libs/arrow/licenses/log4j-slf4j-impl-2.21.0.jar.sha1 b/libs/arrow/licenses/log4j-slf4j-impl-2.21.0.jar.sha1
deleted file mode 100644
index 0e22f98daa61c..0000000000000
--- a/libs/arrow/licenses/log4j-slf4j-impl-2.21.0.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-911fdb5b1a1df36719c579ecc6f2957b88bce1ab
\ No newline at end of file
diff --git a/libs/arrow/licenses/log4j-slf4j-impl-LICENSE.txt b/libs/arrow/licenses/log4j-slf4j-impl-LICENSE.txt
deleted file mode 100644
index 6279e5206de13..0000000000000
--- a/libs/arrow/licenses/log4j-slf4j-impl-LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
- 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 1999-2005 The Apache Software Foundation
-
- 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/libs/arrow/licenses/log4j-slf4j-impl-NOTICE.txt b/libs/arrow/licenses/log4j-slf4j-impl-NOTICE.txt
deleted file mode 100644
index 0c37b52bfe7ad..0000000000000
--- a/libs/arrow/licenses/log4j-slf4j-impl-NOTICE.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-Apache Log4j
-Copyright 1999-2024 Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-ResolverUtil.java
-Copyright 2005-2006 Tim Fennell
-
-Dumbster SMTP test server
-Copyright 2004 Jason Paul Kitchen
-
-TypeUtil.java
-Copyright 2002-2012 Ramnivas Laddad, Juergen Hoeller, Chris Beams
-
-picocli (http://picocli.info)
-Copyright 2017 Remko Popma
-
-TimeoutBlockingWaitStrategy.java and parts of Util.java
-Copyright 2011 LMAX Ltd.
diff --git a/libs/arrow/licenses/snakeyaml-2.1.jar.sha1 b/libs/arrow/licenses/snakeyaml-2.1.jar.sha1
deleted file mode 100644
index 5586b210a9736..0000000000000
--- a/libs/arrow/licenses/snakeyaml-2.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-c79f47315517560b5bd6a62376ee385e48105437
\ No newline at end of file
diff --git a/libs/arrow/licenses/snakeyaml-LICENSE.txt b/libs/arrow/licenses/snakeyaml-LICENSE.txt
deleted file mode 100644
index d9a10c0d8e868..0000000000000
--- a/libs/arrow/licenses/snakeyaml-LICENSE.txt
+++ /dev/null
@@ -1,176 +0,0 @@
- 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
diff --git a/libs/arrow/licenses/snakeyaml-NOTICE.txt b/libs/arrow/licenses/snakeyaml-NOTICE.txt
deleted file mode 100644
index b51464eee1f00..0000000000000
--- a/libs/arrow/licenses/snakeyaml-NOTICE.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-***The art of simplicity is a puzzle of complexity.***
-
-## Overview ##
-[YAML](http://yaml.org) is a data serialization format designed for human readability and interaction with scripting languages.
-
-SnakeYAML is a YAML processor for the Java Virtual Machine.
-
-## SnakeYAML features ##
-
-* a **complete** [YAML 1.1 processor](http://yaml.org/spec/1.1/current.html). In particular, SnakeYAML can parse all examples from the specification.
-* Unicode support including UTF-8/UTF-16 input/output.
-* high-level API for serializing and deserializing native Java objects.
-* support for all types from the [YAML types repository](http://yaml.org/type/index.html).
-* relatively sensible error messages.
-
-## Info ##
- * [Changes](https://bitbucket.org/asomov/snakeyaml/wiki/Changes)
- * [Documentation](https://bitbucket.org/asomov/snakeyaml/wiki/Documentation)
-
-## Contribute ##
-* Mercurial DVCS is used to dance with the [source code](https://bitbucket.org/asomov/snakeyaml/src).
-* If you find a bug in SnakeYAML, please [file a bug report](https://bitbucket.org/asomov/snakeyaml/issues?status=new&status=open).
-* You may discuss SnakeYAML at
-[the mailing list](http://groups.google.com/group/snakeyaml-core).
\ No newline at end of file
diff --git a/libs/arrow/src/main/java/org/opensearch/arrow/StreamIterator.java b/libs/arrow/src/main/java/org/opensearch/arrow/StreamIterator.java
deleted file mode 100644
index 4c434854084e4..0000000000000
--- a/libs/arrow/src/main/java/org/opensearch/arrow/StreamIterator.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- *
- * The OpenSearch Contributors require contributions made to
- * this file be licensed under the Apache-2.0 license or a
- * compatible open source license.
- */
-
-package org.opensearch.arrow;
-
-import org.apache.arrow.vector.VectorSchemaRoot;
-import org.opensearch.common.annotation.ExperimentalApi;
-
-import java.io.Closeable;
-
-/**
- * An iterator over stream.
- */
-@ExperimentalApi
-public interface StreamIterator extends Closeable {
-
- /**
- * Blocking request to load next batch into root.
- *
- * @return true if more data was found, false if the stream is exhausted
- */
- boolean next();
-
- /**
- * Returns the VectorSchemaRoot associated with this iterator.
- * The content of this root is updated with each successful call to next().
- *
- * @return the VectorSchemaRoot
- */
- VectorSchemaRoot getRoot();
-}
diff --git a/modules/arrow-flight-rpc/build.gradle b/modules/arrow-flight-rpc/build.gradle
index 9ca163b0a14d2..1b987f681c0d5 100644
--- a/modules/arrow-flight-rpc/build.gradle
+++ b/modules/arrow-flight-rpc/build.gradle
@@ -13,11 +13,11 @@ apply plugin: 'opensearch.publish'
opensearchplugin {
description 'Arrow flight based Stream implementation'
- classname 'org.opensearch.flight.FlightStreamPlugin'
+ classname 'org.opensearch.arrow.flight.FlightStreamPlugin'
}
dependencies {
- implementation project(':libs:opensearch-arrow')
+ implementation project(':libs:opensearch-arrow-spi')
implementation project(':modules:transport-netty4')
implementation 'org.checkerframework:checker-qual:3.44.0'
diff --git a/modules/arrow-flight-rpc/src/main/java/org/opensearch/flight/BaseFlightStreamPlugin.java b/modules/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/BaseFlightStreamPlugin.java
similarity index 98%
rename from modules/arrow-flight-rpc/src/main/java/org/opensearch/flight/BaseFlightStreamPlugin.java
rename to modules/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/BaseFlightStreamPlugin.java
index b1a6490781d3c..79d9e6bd2daee 100644
--- a/modules/arrow-flight-rpc/src/main/java/org/opensearch/flight/BaseFlightStreamPlugin.java
+++ b/modules/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/BaseFlightStreamPlugin.java
@@ -6,9 +6,9 @@
* compatible open source license.
*/
-package org.opensearch.flight;
+package org.opensearch.arrow.flight;
-import org.opensearch.arrow.StreamManager;
+import org.opensearch.arrow.spi.StreamManager;
import org.opensearch.client.Client;
import org.opensearch.cluster.metadata.IndexNameExpressionResolver;
import org.opensearch.cluster.service.ClusterService;
diff --git a/modules/arrow-flight-rpc/src/main/java/org/opensearch/flight/FlightStreamPlugin.java b/modules/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/FlightStreamPlugin.java
similarity index 98%
rename from modules/arrow-flight-rpc/src/main/java/org/opensearch/flight/FlightStreamPlugin.java
rename to modules/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/FlightStreamPlugin.java
index 039443f731645..e15206af34990 100644
--- a/modules/arrow-flight-rpc/src/main/java/org/opensearch/flight/FlightStreamPlugin.java
+++ b/modules/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/FlightStreamPlugin.java
@@ -6,9 +6,9 @@
* compatible open source license.
*/
-package org.opensearch.flight;
+package org.opensearch.arrow.flight;
-import org.opensearch.arrow.StreamManager;
+import org.opensearch.arrow.spi.StreamManager;
import org.opensearch.client.Client;
import org.opensearch.cluster.metadata.IndexNameExpressionResolver;
import org.opensearch.cluster.service.ClusterService;
@@ -22,7 +22,7 @@
import org.opensearch.core.xcontent.NamedXContentRegistry;
import org.opensearch.env.Environment;
import org.opensearch.env.NodeEnvironment;
-import org.opensearch.flight.bootstrap.FlightStreamPluginImpl;
+import org.opensearch.arrow.flight.bootstrap.FlightStreamPluginImpl;
import org.opensearch.plugins.SecureTransportSettingsProvider;
import org.opensearch.repositories.RepositoriesService;
import org.opensearch.script.ScriptService;
diff --git a/modules/arrow-flight-rpc/src/main/java/org/opensearch/flight/bootstrap/FlightService.java b/modules/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/bootstrap/FlightService.java
similarity index 89%
rename from modules/arrow-flight-rpc/src/main/java/org/opensearch/flight/bootstrap/FlightService.java
rename to modules/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/bootstrap/FlightService.java
index cb5cee6e70cfb..ca4c3fa63cf00 100644
--- a/modules/arrow-flight-rpc/src/main/java/org/opensearch/flight/bootstrap/FlightService.java
+++ b/modules/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/bootstrap/FlightService.java
@@ -6,7 +6,7 @@
* compatible open source license.
*/
-package org.opensearch.flight.bootstrap;
+package org.opensearch.arrow.flight.bootstrap;
import org.apache.arrow.flight.OpenSearchFlightServer;
import org.apache.arrow.memory.BufferAllocator;
@@ -14,19 +14,19 @@
import org.apache.arrow.util.VisibleForTesting;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
-import org.opensearch.arrow.StreamManager;
+import org.opensearch.arrow.spi.StreamManager;
import org.opensearch.cluster.service.ClusterService;
import org.opensearch.common.SetOnce;
import org.opensearch.common.lifecycle.AbstractLifecycleComponent;
import org.opensearch.common.settings.Settings;
-import org.opensearch.flight.bootstrap.client.FlightClientManager;
-import org.opensearch.flight.bootstrap.server.FlightServerBuilder;
-import org.opensearch.flight.bootstrap.server.ServerConfig;
-import org.opensearch.flight.bootstrap.tls.DefaultSslContextProvider;
-import org.opensearch.flight.bootstrap.tls.DisabledSslContextProvider;
-import org.opensearch.flight.bootstrap.tls.SslContextProvider;
-import org.opensearch.flight.core.BaseFlightProducer;
-import org.opensearch.flight.core.FlightStreamManager;
+import org.opensearch.arrow.flight.bootstrap.client.FlightClientManager;
+import org.opensearch.arrow.flight.bootstrap.server.FlightServerBuilder;
+import org.opensearch.arrow.flight.bootstrap.server.ServerConfig;
+import org.opensearch.arrow.flight.bootstrap.tls.DefaultSslContextProvider;
+import org.opensearch.arrow.flight.bootstrap.tls.DisabledSslContextProvider;
+import org.opensearch.arrow.flight.bootstrap.tls.SslContextProvider;
+import org.opensearch.arrow.flight.core.BaseFlightProducer;
+import org.opensearch.arrow.flight.core.FlightStreamManager;
import org.opensearch.plugins.SecureTransportSettingsProvider;
import org.opensearch.threadpool.ThreadPool;
diff --git a/modules/arrow-flight-rpc/src/main/java/org/opensearch/flight/bootstrap/FlightStreamPluginImpl.java b/modules/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/bootstrap/FlightStreamPluginImpl.java
similarity index 95%
rename from modules/arrow-flight-rpc/src/main/java/org/opensearch/flight/bootstrap/FlightStreamPluginImpl.java
rename to modules/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/bootstrap/FlightStreamPluginImpl.java
index 32ebd7f3c7be1..06bb46aeaaeff 100644
--- a/modules/arrow-flight-rpc/src/main/java/org/opensearch/flight/bootstrap/FlightStreamPluginImpl.java
+++ b/modules/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/bootstrap/FlightStreamPluginImpl.java
@@ -6,9 +6,9 @@
* compatible open source license.
*/
-package org.opensearch.flight.bootstrap;
+package org.opensearch.arrow.flight.bootstrap;
-import org.opensearch.arrow.StreamManager;
+import org.opensearch.arrow.spi.StreamManager;
import org.opensearch.client.Client;
import org.opensearch.cluster.metadata.IndexNameExpressionResolver;
import org.opensearch.cluster.service.ClusterService;
@@ -21,8 +21,8 @@
import org.opensearch.core.xcontent.NamedXContentRegistry;
import org.opensearch.env.Environment;
import org.opensearch.env.NodeEnvironment;
-import org.opensearch.flight.BaseFlightStreamPlugin;
-import org.opensearch.flight.bootstrap.server.ServerConfig;
+import org.opensearch.arrow.flight.BaseFlightStreamPlugin;
+import org.opensearch.arrow.flight.bootstrap.server.ServerConfig;
import org.opensearch.plugins.SecureTransportSettingsProvider;
import org.opensearch.repositories.RepositoriesService;
import org.opensearch.script.ScriptService;
diff --git a/modules/arrow-flight-rpc/src/main/java/org/opensearch/flight/bootstrap/client/FlightClientBuilder.java b/modules/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/bootstrap/client/FlightClientBuilder.java
similarity index 94%
rename from modules/arrow-flight-rpc/src/main/java/org/opensearch/flight/bootstrap/client/FlightClientBuilder.java
rename to modules/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/bootstrap/client/FlightClientBuilder.java
index e958ab48791c4..a637fc8dc8c04 100644
--- a/modules/arrow-flight-rpc/src/main/java/org/opensearch/flight/bootstrap/client/FlightClientBuilder.java
+++ b/modules/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/bootstrap/client/FlightClientBuilder.java
@@ -6,12 +6,12 @@
* compatible open source license.
*/
-package org.opensearch.flight.bootstrap.client;
+package org.opensearch.arrow.flight.bootstrap.client;
import org.apache.arrow.flight.Location;
import org.apache.arrow.flight.OpenSearchFlightClient;
import org.apache.arrow.memory.BufferAllocator;
-import org.opensearch.flight.bootstrap.tls.SslContextProvider;
+import org.opensearch.arrow.flight.bootstrap.tls.SslContextProvider;
/**
* Builder class for creating OpenSearchFlightClient instances.
diff --git a/modules/arrow-flight-rpc/src/main/java/org/opensearch/flight/bootstrap/client/FlightClientManager.java b/modules/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/bootstrap/client/FlightClientManager.java
similarity index 97%
rename from modules/arrow-flight-rpc/src/main/java/org/opensearch/flight/bootstrap/client/FlightClientManager.java
rename to modules/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/bootstrap/client/FlightClientManager.java
index 1fd5614cb08aa..8c90285f19d8b 100644
--- a/modules/arrow-flight-rpc/src/main/java/org/opensearch/flight/bootstrap/client/FlightClientManager.java
+++ b/modules/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/bootstrap/client/FlightClientManager.java
@@ -6,7 +6,7 @@
* compatible open source license.
*/
-package org.opensearch.flight.bootstrap.client;
+package org.opensearch.arrow.flight.bootstrap.client;
import org.apache.arrow.flight.Location;
import org.apache.arrow.flight.OpenSearchFlightClient;
@@ -16,7 +16,7 @@
import org.opensearch.cluster.ClusterStateListener;
import org.opensearch.cluster.node.DiscoveryNode;
import org.opensearch.cluster.service.ClusterService;
-import org.opensearch.flight.bootstrap.tls.SslContextProvider;
+import org.opensearch.arrow.flight.bootstrap.tls.SslContextProvider;
import java.util.Map;
import java.util.Objects;
diff --git a/modules/arrow-flight-rpc/src/main/java/org/opensearch/flight/bootstrap/client/package-info.java b/modules/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/bootstrap/client/package-info.java
similarity index 85%
rename from modules/arrow-flight-rpc/src/main/java/org/opensearch/flight/bootstrap/client/package-info.java
rename to modules/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/bootstrap/client/package-info.java
index a85ccfe3a00e4..d141ab75905a0 100644
--- a/modules/arrow-flight-rpc/src/main/java/org/opensearch/flight/bootstrap/client/package-info.java
+++ b/modules/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/bootstrap/client/package-info.java
@@ -9,4 +9,4 @@
/**
* Client-side bootstrap components for OpenSearch Flight service, including client configuration and initialization.
*/
-package org.opensearch.flight.bootstrap.client;
+package org.opensearch.arrow.flight.bootstrap.client;
diff --git a/modules/arrow-flight-rpc/src/main/java/org/opensearch/flight/bootstrap/package-info.java b/modules/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/bootstrap/package-info.java
similarity index 86%
rename from modules/arrow-flight-rpc/src/main/java/org/opensearch/flight/bootstrap/package-info.java
rename to modules/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/bootstrap/package-info.java
index 4d48a9e9e02fe..3ee247809b0c0 100644
--- a/modules/arrow-flight-rpc/src/main/java/org/opensearch/flight/bootstrap/package-info.java
+++ b/modules/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/bootstrap/package-info.java
@@ -9,4 +9,4 @@
/**
* Bootstrap classes for initializing and configuring OpenSearch Flight service.
*/
-package org.opensearch.flight.bootstrap;
+package org.opensearch.arrow.flight.bootstrap;
diff --git a/modules/arrow-flight-rpc/src/main/java/org/opensearch/flight/bootstrap/server/FlightServerBuilder.java b/modules/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/bootstrap/server/FlightServerBuilder.java
similarity index 91%
rename from modules/arrow-flight-rpc/src/main/java/org/opensearch/flight/bootstrap/server/FlightServerBuilder.java
rename to modules/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/bootstrap/server/FlightServerBuilder.java
index 30be80c0a449c..f8fde465febdc 100644
--- a/modules/arrow-flight-rpc/src/main/java/org/opensearch/flight/bootstrap/server/FlightServerBuilder.java
+++ b/modules/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/bootstrap/server/FlightServerBuilder.java
@@ -6,20 +6,20 @@
* compatible open source license.
*/
-package org.opensearch.flight.bootstrap.server;
+package org.opensearch.arrow.flight.bootstrap.server;
import org.apache.arrow.flight.FlightProducer;
import org.apache.arrow.flight.Location;
import org.apache.arrow.flight.OpenSearchFlightServer;
import org.apache.arrow.memory.BufferAllocator;
-import org.opensearch.flight.bootstrap.tls.SslContextProvider;
+import org.opensearch.arrow.flight.bootstrap.tls.SslContextProvider;
import org.opensearch.threadpool.ThreadPool;
import java.io.IOException;
import java.util.concurrent.ExecutorService;
import java.util.function.Supplier;
-import static org.opensearch.flight.bootstrap.server.ServerConfig.FLIGHT_THREAD_POOL_NAME;
+import static org.opensearch.arrow.flight.bootstrap.server.ServerConfig.FLIGHT_THREAD_POOL_NAME;
/**
* Builder class for creating and configuring OpenSearch Flight server instances.
diff --git a/modules/arrow-flight-rpc/src/main/java/org/opensearch/flight/bootstrap/server/ServerConfig.java b/modules/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/bootstrap/server/ServerConfig.java
similarity index 99%
rename from modules/arrow-flight-rpc/src/main/java/org/opensearch/flight/bootstrap/server/ServerConfig.java
rename to modules/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/bootstrap/server/ServerConfig.java
index 3b444bd8783ce..6f799d8129718 100644
--- a/modules/arrow-flight-rpc/src/main/java/org/opensearch/flight/bootstrap/server/ServerConfig.java
+++ b/modules/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/bootstrap/server/ServerConfig.java
@@ -6,7 +6,7 @@
* compatible open source license.
*/
-package org.opensearch.flight.bootstrap.server;
+package org.opensearch.arrow.flight.bootstrap.server;
import org.apache.arrow.flight.Location;
import org.opensearch.common.settings.Setting;
diff --git a/modules/arrow-flight-rpc/src/main/java/org/opensearch/flight/bootstrap/server/package-info.java b/modules/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/bootstrap/server/package-info.java
similarity index 85%
rename from modules/arrow-flight-rpc/src/main/java/org/opensearch/flight/bootstrap/server/package-info.java
rename to modules/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/bootstrap/server/package-info.java
index bfc956d1550b5..120b513ac2eec 100644
--- a/modules/arrow-flight-rpc/src/main/java/org/opensearch/flight/bootstrap/server/package-info.java
+++ b/modules/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/bootstrap/server/package-info.java
@@ -9,4 +9,4 @@
/**
* Server-side bootstrap components for OpenSearch Flight service, including server configuration and initialization.
*/
-package org.opensearch.flight.bootstrap.server;
+package org.opensearch.arrow.flight.bootstrap.server;
diff --git a/modules/arrow-flight-rpc/src/main/java/org/opensearch/flight/bootstrap/tls/DefaultSslContextProvider.java b/modules/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/bootstrap/tls/DefaultSslContextProvider.java
similarity index 99%
rename from modules/arrow-flight-rpc/src/main/java/org/opensearch/flight/bootstrap/tls/DefaultSslContextProvider.java
rename to modules/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/bootstrap/tls/DefaultSslContextProvider.java
index e58630eea242e..ca74bc6d4013e 100644
--- a/modules/arrow-flight-rpc/src/main/java/org/opensearch/flight/bootstrap/tls/DefaultSslContextProvider.java
+++ b/modules/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/bootstrap/tls/DefaultSslContextProvider.java
@@ -6,7 +6,7 @@
* compatible open source license.
*/
-package org.opensearch.flight.bootstrap.tls;
+package org.opensearch.arrow.flight.bootstrap.tls;
import org.opensearch.OpenSearchException;
import org.opensearch.plugins.SecureTransportSettingsProvider;
diff --git a/modules/arrow-flight-rpc/src/main/java/org/opensearch/flight/bootstrap/tls/DisabledSslContextProvider.java b/modules/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/bootstrap/tls/DisabledSslContextProvider.java
similarity index 95%
rename from modules/arrow-flight-rpc/src/main/java/org/opensearch/flight/bootstrap/tls/DisabledSslContextProvider.java
rename to modules/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/bootstrap/tls/DisabledSslContextProvider.java
index b31d6e433e460..e7782b33a9b81 100644
--- a/modules/arrow-flight-rpc/src/main/java/org/opensearch/flight/bootstrap/tls/DisabledSslContextProvider.java
+++ b/modules/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/bootstrap/tls/DisabledSslContextProvider.java
@@ -6,7 +6,7 @@
* compatible open source license.
*/
-package org.opensearch.flight.bootstrap.tls;
+package org.opensearch.arrow.flight.bootstrap.tls;
import io.netty.handler.ssl.SslContext;
diff --git a/modules/arrow-flight-rpc/src/main/java/org/opensearch/flight/bootstrap/tls/SslContextProvider.java b/modules/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/bootstrap/tls/SslContextProvider.java
similarity index 95%
rename from modules/arrow-flight-rpc/src/main/java/org/opensearch/flight/bootstrap/tls/SslContextProvider.java
rename to modules/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/bootstrap/tls/SslContextProvider.java
index ea0ef268849ce..2ed520e5d01a3 100644
--- a/modules/arrow-flight-rpc/src/main/java/org/opensearch/flight/bootstrap/tls/SslContextProvider.java
+++ b/modules/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/bootstrap/tls/SslContextProvider.java
@@ -6,7 +6,7 @@
* compatible open source license.
*/
-package org.opensearch.flight.bootstrap.tls;
+package org.opensearch.arrow.flight.bootstrap.tls;
import io.netty.handler.ssl.SslContext;
diff --git a/modules/arrow-flight-rpc/src/main/java/org/opensearch/flight/bootstrap/tls/package-info.java b/modules/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/bootstrap/tls/package-info.java
similarity index 85%
rename from modules/arrow-flight-rpc/src/main/java/org/opensearch/flight/bootstrap/tls/package-info.java
rename to modules/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/bootstrap/tls/package-info.java
index e25a555d6510b..2ad8ae734c2da 100644
--- a/modules/arrow-flight-rpc/src/main/java/org/opensearch/flight/bootstrap/tls/package-info.java
+++ b/modules/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/bootstrap/tls/package-info.java
@@ -9,4 +9,4 @@
/**
* TLS/SSL configuration and security components for OpenSearch Flight service.
*/
-package org.opensearch.flight.bootstrap.tls;
+package org.opensearch.arrow.flight.bootstrap.tls;
diff --git a/modules/arrow-flight-rpc/src/main/java/org/opensearch/flight/core/BaseBackpressureStrategy.java b/modules/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/core/BaseBackpressureStrategy.java
similarity index 96%
rename from modules/arrow-flight-rpc/src/main/java/org/opensearch/flight/core/BaseBackpressureStrategy.java
rename to modules/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/core/BaseBackpressureStrategy.java
index 66283be8c3b39..887eea67ab997 100644
--- a/modules/arrow-flight-rpc/src/main/java/org/opensearch/flight/core/BaseBackpressureStrategy.java
+++ b/modules/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/core/BaseBackpressureStrategy.java
@@ -6,7 +6,7 @@
* compatible open source license.
*/
-package org.opensearch.flight.core;
+package org.opensearch.arrow.flight.core;
import org.apache.arrow.flight.BackpressureStrategy;
diff --git a/modules/arrow-flight-rpc/src/main/java/org/opensearch/flight/core/BaseFlightProducer.java b/modules/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/core/BaseFlightProducer.java
similarity index 97%
rename from modules/arrow-flight-rpc/src/main/java/org/opensearch/flight/core/BaseFlightProducer.java
rename to modules/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/core/BaseFlightProducer.java
index 0c2447946f9aa..e370417335aef 100644
--- a/modules/arrow-flight-rpc/src/main/java/org/opensearch/flight/core/BaseFlightProducer.java
+++ b/modules/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/core/BaseFlightProducer.java
@@ -6,7 +6,7 @@
* compatible open source license.
*/
-package org.opensearch.flight.core;
+package org.opensearch.arrow.flight.core;
import org.apache.arrow.flight.BackpressureStrategy;
import org.apache.arrow.flight.CallStatus;
@@ -21,9 +21,9 @@
import org.apache.arrow.vector.VectorSchemaRoot;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
-import org.opensearch.arrow.StreamProducer;
-import org.opensearch.arrow.StreamTicket;
-import org.opensearch.flight.bootstrap.client.FlightClientManager;
+import org.opensearch.arrow.spi.StreamProducer;
+import org.opensearch.arrow.spi.StreamTicket;
+import org.opensearch.arrow.flight.bootstrap.client.FlightClientManager;
import java.util.Collections;
diff --git a/modules/arrow-flight-rpc/src/main/java/org/opensearch/flight/core/FlightStreamManager.java b/modules/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/core/FlightStreamManager.java
similarity index 93%
rename from modules/arrow-flight-rpc/src/main/java/org/opensearch/flight/core/FlightStreamManager.java
rename to modules/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/core/FlightStreamManager.java
index ef7eaa7808490..baa4931fd172b 100644
--- a/modules/arrow-flight-rpc/src/main/java/org/opensearch/flight/core/FlightStreamManager.java
+++ b/modules/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/core/FlightStreamManager.java
@@ -6,22 +6,22 @@
* compatible open source license.
*/
-package org.opensearch.flight.core;
+package org.opensearch.arrow.flight.core;
import org.apache.arrow.flight.FlightStream;
import org.apache.arrow.flight.Ticket;
import org.apache.arrow.memory.BufferAllocator;
import org.apache.arrow.vector.VectorSchemaRoot;
-import org.opensearch.arrow.StreamIterator;
-import org.opensearch.arrow.StreamManager;
-import org.opensearch.arrow.StreamProducer;
-import org.opensearch.arrow.StreamTicket;
+import org.opensearch.arrow.spi.StreamReader;
+import org.opensearch.arrow.spi.StreamManager;
+import org.opensearch.arrow.spi.StreamProducer;
+import org.opensearch.arrow.spi.StreamTicket;
import org.opensearch.common.SetOnce;
import org.opensearch.common.cache.Cache;
import org.opensearch.common.cache.CacheBuilder;
import org.opensearch.common.unit.TimeValue;
import org.opensearch.core.tasks.TaskId;
-import org.opensearch.flight.bootstrap.client.FlightClientManager;
+import org.opensearch.arrow.flight.bootstrap.client.FlightClientManager;
import java.util.UUID;
import java.util.function.Supplier;
@@ -75,9 +75,9 @@ public StreamTicket registerStream(StreamProducer provider, TaskId parentTaskId)
* @return A StreamIterator instance for the specified stream.
*/
@Override
- public StreamIterator getStreamIterator(StreamTicket ticket) {
+ public StreamReader getStreamIterator(StreamTicket ticket) {
FlightStream stream = clientManager.getFlightClient(ticket.getNodeID()).getStream(new Ticket(ticket.toBytes()));
- return new FlightStreamIterator(stream);
+ return new FlightStreamReader(stream);
}
/**
diff --git a/modules/arrow-flight-rpc/src/main/java/org/opensearch/flight/core/FlightStreamIterator.java b/modules/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/core/FlightStreamReader.java
similarity index 87%
rename from modules/arrow-flight-rpc/src/main/java/org/opensearch/flight/core/FlightStreamIterator.java
rename to modules/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/core/FlightStreamReader.java
index ce3fba2c40cb6..62af6304c5ecd 100644
--- a/modules/arrow-flight-rpc/src/main/java/org/opensearch/flight/core/FlightStreamIterator.java
+++ b/modules/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/core/FlightStreamReader.java
@@ -6,17 +6,17 @@
* compatible open source license.
*/
-package org.opensearch.flight.core;
+package org.opensearch.arrow.flight.core;
import org.apache.arrow.flight.FlightStream;
import org.apache.arrow.vector.VectorSchemaRoot;
-import org.opensearch.arrow.StreamIterator;
+import org.opensearch.arrow.spi.StreamReader;
/**
* FlightStreamIterator is a wrapper class that adapts the FlightStream interface
* to the StreamIterator interface.
*/
-public class FlightStreamIterator implements StreamIterator {
+public class FlightStreamReader implements StreamReader {
private final FlightStream flightStream;
@@ -25,7 +25,7 @@ public class FlightStreamIterator implements StreamIterator {
*
* @param flightStream The FlightStream to be adapted.
*/
- public FlightStreamIterator(FlightStream flightStream) {
+ public FlightStreamReader(FlightStream flightStream) {
this.flightStream = flightStream;
}
diff --git a/modules/arrow-flight-rpc/src/main/java/org/opensearch/flight/core/ProxyStreamProducer.java b/modules/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/core/ProxyStreamProducer.java
similarity index 95%
rename from modules/arrow-flight-rpc/src/main/java/org/opensearch/flight/core/ProxyStreamProducer.java
rename to modules/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/core/ProxyStreamProducer.java
index 3066a03d0fddb..fe314fb0cb190 100644
--- a/modules/arrow-flight-rpc/src/main/java/org/opensearch/flight/core/ProxyStreamProducer.java
+++ b/modules/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/core/ProxyStreamProducer.java
@@ -6,13 +6,13 @@
* compatible open source license.
*/
-package org.opensearch.flight.core;
+package org.opensearch.arrow.flight.core;
import org.apache.arrow.flight.FlightStream;
import org.apache.arrow.memory.BufferAllocator;
import org.apache.arrow.vector.VectorSchemaRoot;
-import org.opensearch.arrow.StreamProducer;
-import org.opensearch.arrow.StreamTicket;
+import org.opensearch.arrow.spi.StreamProducer;
+import org.opensearch.arrow.spi.StreamTicket;
/**
* ProxyStreamProvider acts as forward proxy for FlightStream.
diff --git a/modules/arrow-flight-rpc/src/main/java/org/opensearch/flight/core/package-info.java b/modules/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/core/package-info.java
similarity index 88%
rename from modules/arrow-flight-rpc/src/main/java/org/opensearch/flight/core/package-info.java
rename to modules/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/core/package-info.java
index d575764a3d89f..0178e2d43585d 100644
--- a/modules/arrow-flight-rpc/src/main/java/org/opensearch/flight/core/package-info.java
+++ b/modules/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/core/package-info.java
@@ -9,4 +9,4 @@
/**
* Core components and implementations for OpenSearch Flight service, including base producers and consumers.
*/
-package org.opensearch.flight.core;
+package org.opensearch.arrow.flight.core;
diff --git a/modules/arrow-flight-rpc/src/main/java/org/opensearch/flight/package-info.java b/modules/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/package-info.java
similarity index 89%
rename from modules/arrow-flight-rpc/src/main/java/org/opensearch/flight/package-info.java
rename to modules/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/package-info.java
index 6b528e6bfd535..2341a24d0be85 100644
--- a/modules/arrow-flight-rpc/src/main/java/org/opensearch/flight/package-info.java
+++ b/modules/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/package-info.java
@@ -9,4 +9,4 @@
/**
* Root package for OpenSearch Flight functionality, providing core flight service integration with OpenSearch.
*/
-package org.opensearch.flight;
+package org.opensearch.arrow.flight;
diff --git a/modules/arrow-flight-rpc/src/test/java/org/opensearch/flight/FlightStreamPluginTests.java b/modules/arrow-flight-rpc/src/test/java/org/opensearch/arrow/flight/FlightStreamPluginTests.java
similarity index 95%
rename from modules/arrow-flight-rpc/src/test/java/org/opensearch/flight/FlightStreamPluginTests.java
rename to modules/arrow-flight-rpc/src/test/java/org/opensearch/arrow/flight/FlightStreamPluginTests.java
index 8a5eaf3b57976..162f8aaa8496a 100644
--- a/modules/arrow-flight-rpc/src/test/java/org/opensearch/flight/FlightStreamPluginTests.java
+++ b/modules/arrow-flight-rpc/src/test/java/org/opensearch/arrow/flight/FlightStreamPluginTests.java
@@ -2,13 +2,13 @@
* SPDX-License-Identifier: Apache-2.0
*
* The OpenSearch Contributors require contributions made to
- * this file be licensed under the Apache-2.0 license or a.java
+ * this file be licensed under the Apache-2.0 license or a
* compatible open source license.
*/
-package org.opensearch.flight;
+package org.opensearch.arrow.flight;
-import org.opensearch.arrow.StreamManager;
+import org.opensearch.arrow.spi.StreamManager;
import org.opensearch.cluster.service.ClusterService;
import org.opensearch.common.settings.Setting;
import org.opensearch.common.settings.Settings;
diff --git a/modules/arrow-flight-rpc/src/test/java/org/opensearch/flight/bootstrap/FlightServiceTests.java b/modules/arrow-flight-rpc/src/test/java/org/opensearch/arrow/flight/bootstrap/FlightServiceTests.java
similarity index 95%
rename from modules/arrow-flight-rpc/src/test/java/org/opensearch/flight/bootstrap/FlightServiceTests.java
rename to modules/arrow-flight-rpc/src/test/java/org/opensearch/arrow/flight/bootstrap/FlightServiceTests.java
index 1c6db39b17030..7edbd64169fc7 100644
--- a/modules/arrow-flight-rpc/src/test/java/org/opensearch/flight/bootstrap/FlightServiceTests.java
+++ b/modules/arrow-flight-rpc/src/test/java/org/opensearch/arrow/flight/bootstrap/FlightServiceTests.java
@@ -5,16 +5,16 @@
* this file be licensed under the Apache-2.0 license or a
* compatible open source license.
*/
-package org.opensearch.flight.bootstrap;
+package org.opensearch.arrow.flight.bootstrap;
import org.apache.arrow.flight.Action;
import org.apache.arrow.flight.OpenSearchFlightClient;
import org.opensearch.cluster.service.ClusterService;
import org.opensearch.common.settings.Settings;
-import org.opensearch.flight.bootstrap.client.FlightClientBuilder;
-import org.opensearch.flight.bootstrap.tls.DefaultSslContextProvider;
-import org.opensearch.flight.bootstrap.tls.DisabledSslContextProvider;
-import org.opensearch.flight.bootstrap.tls.SslContextProvider;
+import org.opensearch.arrow.flight.bootstrap.client.FlightClientBuilder;
+import org.opensearch.arrow.flight.bootstrap.tls.DefaultSslContextProvider;
+import org.opensearch.arrow.flight.bootstrap.tls.DisabledSslContextProvider;
+import org.opensearch.arrow.flight.bootstrap.tls.SslContextProvider;
import org.opensearch.plugins.SecureTransportSettingsProvider;
import org.opensearch.test.OpenSearchTestCase;
import org.opensearch.threadpool.ThreadPool;
diff --git a/modules/arrow-flight-rpc/src/test/java/org/opensearch/flight/bootstrap/client/FlightClientManagerTests.java b/modules/arrow-flight-rpc/src/test/java/org/opensearch/arrow/flight/bootstrap/client/FlightClientManagerTests.java
similarity index 97%
rename from modules/arrow-flight-rpc/src/test/java/org/opensearch/flight/bootstrap/client/FlightClientManagerTests.java
rename to modules/arrow-flight-rpc/src/test/java/org/opensearch/arrow/flight/bootstrap/client/FlightClientManagerTests.java
index e4d8d2c146acb..6c4add7f3e9d7 100644
--- a/modules/arrow-flight-rpc/src/test/java/org/opensearch/flight/bootstrap/client/FlightClientManagerTests.java
+++ b/modules/arrow-flight-rpc/src/test/java/org/opensearch/arrow/flight/bootstrap/client/FlightClientManagerTests.java
@@ -5,7 +5,7 @@
* this file be licensed under the Apache-2.0 license or a
* compatible open source license.
*/
-package org.opensearch.flight.bootstrap.client;
+package org.opensearch.arrow.flight.bootstrap.client;
import org.apache.arrow.flight.Location;
import org.apache.arrow.flight.OpenSearchFlightClient;
@@ -21,8 +21,8 @@
import org.opensearch.cluster.service.ClusterService;
import org.opensearch.common.settings.Settings;
import org.opensearch.core.common.transport.TransportAddress;
-import org.opensearch.flight.bootstrap.server.ServerConfig;
-import org.opensearch.flight.bootstrap.tls.SslContextProvider;
+import org.opensearch.arrow.flight.bootstrap.server.ServerConfig;
+import org.opensearch.arrow.flight.bootstrap.tls.SslContextProvider;
import org.opensearch.test.OpenSearchTestCase;
import java.net.InetAddress;
diff --git a/modules/arrow-flight-rpc/src/test/java/org/opensearch/flight/bootstrap/server/FlightServerBuilderTests.java b/modules/arrow-flight-rpc/src/test/java/org/opensearch/arrow/flight/bootstrap/server/FlightServerBuilderTests.java
similarity index 95%
rename from modules/arrow-flight-rpc/src/test/java/org/opensearch/flight/bootstrap/server/FlightServerBuilderTests.java
rename to modules/arrow-flight-rpc/src/test/java/org/opensearch/arrow/flight/bootstrap/server/FlightServerBuilderTests.java
index f6f79260fe3a9..d3e73842181cb 100644
--- a/modules/arrow-flight-rpc/src/test/java/org/opensearch/flight/bootstrap/server/FlightServerBuilderTests.java
+++ b/modules/arrow-flight-rpc/src/test/java/org/opensearch/arrow/flight/bootstrap/server/FlightServerBuilderTests.java
@@ -6,13 +6,13 @@
* compatible open source license.
*/
-package org.opensearch.flight.bootstrap.server;
+package org.opensearch.arrow.flight.bootstrap.server;
import org.apache.arrow.flight.FlightProducer;
import org.apache.arrow.memory.BufferAllocator;
import org.apache.arrow.memory.RootAllocator;
import org.opensearch.common.settings.Settings;
-import org.opensearch.flight.bootstrap.tls.SslContextProvider;
+import org.opensearch.arrow.flight.bootstrap.tls.SslContextProvider;
import org.opensearch.test.OpenSearchTestCase;
import org.opensearch.threadpool.ThreadPool;
diff --git a/modules/arrow-flight-rpc/src/test/java/org/opensearch/flight/bootstrap/server/ServerConfigTests.java b/modules/arrow-flight-rpc/src/test/java/org/opensearch/arrow/flight/bootstrap/server/ServerConfigTests.java
similarity index 98%
rename from modules/arrow-flight-rpc/src/test/java/org/opensearch/flight/bootstrap/server/ServerConfigTests.java
rename to modules/arrow-flight-rpc/src/test/java/org/opensearch/arrow/flight/bootstrap/server/ServerConfigTests.java
index 875757b91daf9..6f795f5e677d4 100644
--- a/modules/arrow-flight-rpc/src/test/java/org/opensearch/flight/bootstrap/server/ServerConfigTests.java
+++ b/modules/arrow-flight-rpc/src/test/java/org/opensearch/arrow/flight/bootstrap/server/ServerConfigTests.java
@@ -5,7 +5,7 @@
* this file be licensed under the Apache-2.0 license or a
* compatible open source license.
*/
-package org.opensearch.flight.bootstrap.server;
+package org.opensearch.arrow.flight.bootstrap.server;
import org.apache.arrow.flight.Location;
import org.opensearch.common.settings.Settings;
diff --git a/modules/arrow-flight-rpc/src/test/java/org/opensearch/flight/core/BaseFlightProducerTests.java b/modules/arrow-flight-rpc/src/test/java/org/opensearch/arrow/flight/core/BaseFlightProducerTests.java
similarity index 98%
rename from modules/arrow-flight-rpc/src/test/java/org/opensearch/flight/core/BaseFlightProducerTests.java
rename to modules/arrow-flight-rpc/src/test/java/org/opensearch/arrow/flight/core/BaseFlightProducerTests.java
index 6c246555ea4a3..e61194fe892fd 100644
--- a/modules/arrow-flight-rpc/src/test/java/org/opensearch/flight/core/BaseFlightProducerTests.java
+++ b/modules/arrow-flight-rpc/src/test/java/org/opensearch/arrow/flight/core/BaseFlightProducerTests.java
@@ -6,7 +6,7 @@
* compatible open source license.
*/
-package org.opensearch.flight.core;
+package org.opensearch.arrow.flight.core;
import org.apache.arrow.flight.FlightProducer;
import org.apache.arrow.flight.Ticket;
@@ -15,9 +15,9 @@
import org.apache.arrow.vector.VectorSchemaRoot;
import org.apache.arrow.vector.dictionary.DictionaryProvider;
import org.apache.arrow.vector.ipc.message.IpcOption;
-import org.opensearch.arrow.StreamProducer;
-import org.opensearch.arrow.StreamTicket;
-import org.opensearch.flight.bootstrap.client.FlightClientManager;
+import org.opensearch.arrow.spi.StreamProducer;
+import org.opensearch.arrow.spi.StreamTicket;
+import org.opensearch.arrow.flight.bootstrap.client.FlightClientManager;
import org.opensearch.test.OpenSearchTestCase;
import java.util.concurrent.CountDownLatch;
diff --git a/modules/arrow-flight-rpc/src/test/java/org/opensearch/flight/core/FlightStreamManagerTests.java b/modules/arrow-flight-rpc/src/test/java/org/opensearch/arrow/flight/core/FlightStreamManagerTests.java
similarity index 86%
rename from modules/arrow-flight-rpc/src/test/java/org/opensearch/flight/core/FlightStreamManagerTests.java
rename to modules/arrow-flight-rpc/src/test/java/org/opensearch/arrow/flight/core/FlightStreamManagerTests.java
index f6f36fe6ee6cf..8abbee2469d8c 100644
--- a/modules/arrow-flight-rpc/src/test/java/org/opensearch/flight/core/FlightStreamManagerTests.java
+++ b/modules/arrow-flight-rpc/src/test/java/org/opensearch/arrow/flight/core/FlightStreamManagerTests.java
@@ -6,7 +6,7 @@
* compatible open source license.
*/
-package org.opensearch.flight.core;
+package org.opensearch.arrow.flight.core;
import org.apache.arrow.flight.FlightStream;
import org.apache.arrow.flight.OpenSearchFlightClient;
@@ -14,9 +14,9 @@
import org.apache.arrow.memory.BufferAllocator;
import org.apache.arrow.vector.VectorSchemaRoot;
import org.apache.arrow.vector.types.pojo.Schema;
-import org.opensearch.arrow.StreamIterator;
-import org.opensearch.arrow.StreamTicket;
-import org.opensearch.flight.bootstrap.client.FlightClientManager;
+import org.opensearch.arrow.spi.StreamReader;
+import org.opensearch.arrow.spi.StreamTicket;
+import org.opensearch.arrow.flight.bootstrap.client.FlightClientManager;
import org.opensearch.test.OpenSearchTestCase;
import java.util.Collections;
@@ -50,11 +50,11 @@ public void testGetStreamIterator() {
when(mockFlightStream.getRoot()).thenReturn(mockRoot);
when(mockRoot.getSchema()).thenReturn(new Schema(Collections.emptyList()));
- StreamIterator streamIterator = flightStreamManager.getStreamIterator(ticket);
+ StreamReader streamReader = flightStreamManager.getStreamIterator(ticket);
- assertNotNull(streamIterator);
- assertNotNull(streamIterator.getRoot());
- assertEquals(new Schema(Collections.emptyList()), streamIterator.getRoot().getSchema());
+ assertNotNull(streamReader);
+ assertNotNull(streamReader.getRoot());
+ assertEquals(new Schema(Collections.emptyList()), streamReader.getRoot().getSchema());
verify(flightClient).getStream(new Ticket(ticket.toBytes()));
}
diff --git a/modules/arrow-flight-rpc/src/test/java/org/opensearch/flight/core/FlightStreamIteratorTests.java b/modules/arrow-flight-rpc/src/test/java/org/opensearch/arrow/flight/core/FlightStreamReaderTests.java
similarity index 90%
rename from modules/arrow-flight-rpc/src/test/java/org/opensearch/flight/core/FlightStreamIteratorTests.java
rename to modules/arrow-flight-rpc/src/test/java/org/opensearch/arrow/flight/core/FlightStreamReaderTests.java
index 816bc0d297401..10019dc597df6 100644
--- a/modules/arrow-flight-rpc/src/test/java/org/opensearch/flight/core/FlightStreamIteratorTests.java
+++ b/modules/arrow-flight-rpc/src/test/java/org/opensearch/arrow/flight/core/FlightStreamReaderTests.java
@@ -6,7 +6,7 @@
* compatible open source license.
*/
-package org.opensearch.flight.core;
+package org.opensearch.arrow.flight.core;
import org.apache.arrow.flight.FlightStream;
import org.apache.arrow.memory.BufferAllocator;
@@ -17,7 +17,7 @@
import org.apache.arrow.vector.types.pojo.FieldType;
import org.apache.arrow.vector.types.pojo.Schema;
import org.opensearch.common.settings.Settings;
-import org.opensearch.flight.bootstrap.server.ServerConfig;
+import org.opensearch.arrow.flight.bootstrap.server.ServerConfig;
import org.opensearch.test.OpenSearchTestCase;
import java.util.List;
@@ -27,11 +27,11 @@
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-public class FlightStreamIteratorTests extends OpenSearchTestCase {
+public class FlightStreamReaderTests extends OpenSearchTestCase {
private FlightStream mockFlightStream;
- private FlightStreamIterator iterator;
+ private FlightStreamReader iterator;
private VectorSchemaRoot root;
private BufferAllocator allocator;
@@ -45,7 +45,7 @@ public void setUp() throws Exception {
Schema schema = new Schema(List.of(field));
root = VectorSchemaRoot.create(schema, allocator);
when(mockFlightStream.getRoot()).thenReturn(root);
- iterator = new FlightStreamIterator(mockFlightStream);
+ iterator = new FlightStreamReader(mockFlightStream);
}
@Override
diff --git a/modules/arrow-flight-rpc/src/test/java/org/opensearch/flight/core/ProxyStreamProducerTests.java b/modules/arrow-flight-rpc/src/test/java/org/opensearch/arrow/flight/core/ProxyStreamProducerTests.java
similarity index 97%
rename from modules/arrow-flight-rpc/src/test/java/org/opensearch/flight/core/ProxyStreamProducerTests.java
rename to modules/arrow-flight-rpc/src/test/java/org/opensearch/arrow/flight/core/ProxyStreamProducerTests.java
index 405a13a42078f..31fc3f2076f75 100644
--- a/modules/arrow-flight-rpc/src/test/java/org/opensearch/flight/core/ProxyStreamProducerTests.java
+++ b/modules/arrow-flight-rpc/src/test/java/org/opensearch/arrow/flight/core/ProxyStreamProducerTests.java
@@ -6,12 +6,12 @@
* compatible open source license.
*/
-package org.opensearch.flight.core;
+package org.opensearch.arrow.flight.core;
import org.apache.arrow.flight.FlightStream;
import org.apache.arrow.memory.BufferAllocator;
import org.apache.arrow.vector.VectorSchemaRoot;
-import org.opensearch.arrow.StreamProducer;
+import org.opensearch.arrow.spi.StreamProducer;
import org.opensearch.test.OpenSearchTestCase;
import static org.mockito.Mockito.doThrow;
diff --git a/server/build.gradle b/server/build.gradle
index 8c17ed0f22e5e..6d1d94126cf04 100644
--- a/server/build.gradle
+++ b/server/build.gradle
@@ -69,7 +69,7 @@ dependencies {
api project(":libs:opensearch-geo")
api project(":libs:opensearch-telemetry")
api project(":libs:opensearch-task-commons")
- implementation project(':libs:opensearch-arrow')
+ implementation project(':libs:opensearch-arrow-spi')
implementation 'org.checkerframework:checker-qual:3.44.0'
compileOnly project(':libs:opensearch-plugin-classloader')
diff --git a/server/src/main/java/org/opensearch/arrow/ArrowDocIdCollector.java b/server/src/main/java/org/opensearch/arrow/spi/ArrowDocIdCollector.java
similarity index 98%
rename from server/src/main/java/org/opensearch/arrow/ArrowDocIdCollector.java
rename to server/src/main/java/org/opensearch/arrow/spi/ArrowDocIdCollector.java
index b0e9a12a787db..b3a1129417232 100644
--- a/server/src/main/java/org/opensearch/arrow/ArrowDocIdCollector.java
+++ b/server/src/main/java/org/opensearch/arrow/spi/ArrowDocIdCollector.java
@@ -6,7 +6,7 @@
* compatible open source license.
*/
-package org.opensearch.arrow;
+package org.opensearch.arrow.spi;
import org.apache.arrow.vector.IntVector;
import org.apache.arrow.vector.VectorSchemaRoot;
diff --git a/server/src/main/java/org/opensearch/arrow/StreamManagerWrapper.java b/server/src/main/java/org/opensearch/arrow/spi/StreamManagerWrapper.java
similarity index 98%
rename from server/src/main/java/org/opensearch/arrow/StreamManagerWrapper.java
rename to server/src/main/java/org/opensearch/arrow/spi/StreamManagerWrapper.java
index 770cdeefd2194..fc21852f1a9fc 100644
--- a/server/src/main/java/org/opensearch/arrow/StreamManagerWrapper.java
+++ b/server/src/main/java/org/opensearch/arrow/spi/StreamManagerWrapper.java
@@ -6,7 +6,7 @@
* compatible open source license.
*/
-package org.opensearch.arrow;
+package org.opensearch.arrow.spi;
import org.apache.arrow.memory.BufferAllocator;
import org.apache.arrow.vector.VectorSchemaRoot;
@@ -44,7 +44,7 @@ public StreamTicket registerStream(StreamProducer producer, TaskId parentTaskId)
}
@Override
- public StreamIterator getStreamIterator(StreamTicket ticket) {
+ public StreamReader getStreamIterator(StreamTicket ticket) {
return streamManager.getStreamIterator(ticket);
}
diff --git a/server/src/main/java/org/opensearch/arrow/package-info.java b/server/src/main/java/org/opensearch/arrow/spi/package-info.java
similarity index 89%
rename from server/src/main/java/org/opensearch/arrow/package-info.java
rename to server/src/main/java/org/opensearch/arrow/spi/package-info.java
index b9db33537123e..b31b73ebc5a74 100644
--- a/server/src/main/java/org/opensearch/arrow/package-info.java
+++ b/server/src/main/java/org/opensearch/arrow/spi/package-info.java
@@ -9,4 +9,4 @@
/**
* Contains all StreamProducer's and Arrow Flight Stream related customizations
*/
-package org.opensearch.arrow;
+package org.opensearch.arrow.spi;
diff --git a/server/src/main/java/org/opensearch/node/Node.java b/server/src/main/java/org/opensearch/node/Node.java
index 1841db2883393..3a04f51517334 100644
--- a/server/src/main/java/org/opensearch/node/Node.java
+++ b/server/src/main/java/org/opensearch/node/Node.java
@@ -56,8 +56,8 @@
import org.opensearch.action.search.SearchTransportService;
import org.opensearch.action.support.TransportAction;
import org.opensearch.action.update.UpdateHelper;
-import org.opensearch.arrow.StreamManager;
-import org.opensearch.arrow.StreamManagerWrapper;
+import org.opensearch.arrow.spi.StreamManager;
+import org.opensearch.arrow.spi.StreamManagerWrapper;
import org.opensearch.bootstrap.BootstrapCheck;
import org.opensearch.bootstrap.BootstrapContext;
import org.opensearch.client.Client;
diff --git a/server/src/main/java/org/opensearch/plugins/StreamManagerPlugin.java b/server/src/main/java/org/opensearch/plugins/StreamManagerPlugin.java
index 0a01e09fe2094..62a3f2327acd7 100644
--- a/server/src/main/java/org/opensearch/plugins/StreamManagerPlugin.java
+++ b/server/src/main/java/org/opensearch/plugins/StreamManagerPlugin.java
@@ -8,13 +8,13 @@
package org.opensearch.plugins;
-import org.opensearch.arrow.StreamManager;
+import org.opensearch.arrow.spi.StreamManager;
/**
* An interface for OpenSearch plugins to implement to provide a StreamManager.
* This interface is used by the Arrow Flight plugin to get the StreamManager instance.
* Other plugins can also implement this interface to provide their own StreamManager implementation.
- * @see org.opensearch.arrow.StreamManager
+ * @see StreamManager
*/
public interface StreamManagerPlugin {
/**
diff --git a/server/src/main/java/org/opensearch/search/DefaultSearchContext.java b/server/src/main/java/org/opensearch/search/DefaultSearchContext.java
index d4966635422ea..29504e5e0c5dd 100644
--- a/server/src/main/java/org/opensearch/search/DefaultSearchContext.java
+++ b/server/src/main/java/org/opensearch/search/DefaultSearchContext.java
@@ -45,7 +45,7 @@
import org.opensearch.Version;
import org.opensearch.action.search.SearchShardTask;
import org.opensearch.action.search.SearchType;
-import org.opensearch.arrow.StreamManager;
+import org.opensearch.arrow.spi.StreamManager;
import org.opensearch.cluster.service.ClusterService;
import org.opensearch.common.Nullable;
import org.opensearch.common.SetOnce;
diff --git a/server/src/main/java/org/opensearch/search/SearchService.java b/server/src/main/java/org/opensearch/search/SearchService.java
index 7cf4df4491159..2ccbfc7393a77 100644
--- a/server/src/main/java/org/opensearch/search/SearchService.java
+++ b/server/src/main/java/org/opensearch/search/SearchService.java
@@ -49,7 +49,7 @@
import org.opensearch.action.search.UpdatePitContextRequest;
import org.opensearch.action.search.UpdatePitContextResponse;
import org.opensearch.action.support.TransportActions;
-import org.opensearch.arrow.StreamManager;
+import org.opensearch.arrow.spi.StreamManager;
import org.opensearch.cluster.ClusterState;
import org.opensearch.cluster.service.ClusterService;
import org.opensearch.common.CheckedSupplier;
diff --git a/server/src/main/java/org/opensearch/search/internal/SearchContext.java b/server/src/main/java/org/opensearch/search/internal/SearchContext.java
index 83c4a6fdc9ed0..93b9ad931a612 100644
--- a/server/src/main/java/org/opensearch/search/internal/SearchContext.java
+++ b/server/src/main/java/org/opensearch/search/internal/SearchContext.java
@@ -37,7 +37,7 @@
import org.apache.lucene.search.Query;
import org.opensearch.action.search.SearchShardTask;
import org.opensearch.action.search.SearchType;
-import org.opensearch.arrow.StreamManager;
+import org.opensearch.arrow.spi.StreamManager;
import org.opensearch.common.Nullable;
import org.opensearch.common.annotation.PublicApi;
import org.opensearch.common.lease.Releasable;
diff --git a/server/src/main/java/org/opensearch/search/internal/SubSearchContext.java b/server/src/main/java/org/opensearch/search/internal/SubSearchContext.java
index a0638cc51149c..c6694ec3bab6f 100644
--- a/server/src/main/java/org/opensearch/search/internal/SubSearchContext.java
+++ b/server/src/main/java/org/opensearch/search/internal/SubSearchContext.java
@@ -32,7 +32,7 @@
package org.opensearch.search.internal;
import org.apache.lucene.search.Query;
-import org.opensearch.arrow.StreamManager;
+import org.opensearch.arrow.spi.StreamManager;
import org.opensearch.common.unit.TimeValue;
import org.opensearch.index.query.ParsedQuery;
import org.opensearch.search.aggregations.SearchContextAggregations;
diff --git a/server/src/main/java/org/opensearch/search/query/StreamSearchPhase.java b/server/src/main/java/org/opensearch/search/query/StreamSearchPhase.java
index ec57976d03498..dd25d4f1eeeb6 100644
--- a/server/src/main/java/org/opensearch/search/query/StreamSearchPhase.java
+++ b/server/src/main/java/org/opensearch/search/query/StreamSearchPhase.java
@@ -17,10 +17,10 @@
import org.apache.lucene.search.Collector;
import org.apache.lucene.search.Query;
import org.opensearch.OpenSearchException;
-import org.opensearch.arrow.StreamManager;
-import org.opensearch.arrow.StreamProducer;
-import org.opensearch.arrow.StreamTicket;
-import org.opensearch.arrow.ArrowDocIdCollector;
+import org.opensearch.arrow.spi.StreamManager;
+import org.opensearch.arrow.spi.StreamProducer;
+import org.opensearch.arrow.spi.StreamTicket;
+import org.opensearch.arrow.spi.ArrowDocIdCollector;
import org.opensearch.search.SearchContextSourcePrinter;
import org.opensearch.search.aggregations.AggregationProcessor;
import org.opensearch.search.internal.ContextIndexSearcher;
diff --git a/server/src/main/java/org/opensearch/search/stream/OSTicket.java b/server/src/main/java/org/opensearch/search/stream/OSTicket.java
index 2fc3208775937..d0bf37f08f61b 100644
--- a/server/src/main/java/org/opensearch/search/stream/OSTicket.java
+++ b/server/src/main/java/org/opensearch/search/stream/OSTicket.java
@@ -8,7 +8,7 @@
package org.opensearch.search.stream;
-import org.opensearch.arrow.StreamTicket;
+import org.opensearch.arrow.spi.StreamTicket;
import org.opensearch.common.annotation.ExperimentalApi;
import org.opensearch.core.common.io.stream.StreamInput;
import org.opensearch.core.common.io.stream.StreamOutput;
diff --git a/test/framework/build.gradle b/test/framework/build.gradle
index b56b71b8c6dc6..cc554695ba71a 100644
--- a/test/framework/build.gradle
+++ b/test/framework/build.gradle
@@ -39,7 +39,7 @@ dependencies {
api project(":server")
api project(":libs:opensearch-cli")
api project(":test:telemetry")
- implementation project(':libs:opensearch-arrow')
+ implementation project(':libs:opensearch-arrow-spi')
api "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}"
api "junit:junit:${versions.junit}"
diff --git a/test/framework/src/main/java/org/opensearch/node/MockNode.java b/test/framework/src/main/java/org/opensearch/node/MockNode.java
index 6d037f63d6fc7..cd9b5bd8c3126 100644
--- a/test/framework/src/main/java/org/opensearch/node/MockNode.java
+++ b/test/framework/src/main/java/org/opensearch/node/MockNode.java
@@ -32,7 +32,7 @@
package org.opensearch.node;
-import org.opensearch.arrow.StreamManager;
+import org.opensearch.arrow.spi.StreamManager;
import org.opensearch.client.node.NodeClient;
import org.opensearch.cluster.ClusterInfoService;
import org.opensearch.cluster.MockInternalClusterInfoService;
diff --git a/test/framework/src/main/java/org/opensearch/search/MockSearchService.java b/test/framework/src/main/java/org/opensearch/search/MockSearchService.java
index e3fffef4060b1..e8df31ad04f45 100644
--- a/test/framework/src/main/java/org/opensearch/search/MockSearchService.java
+++ b/test/framework/src/main/java/org/opensearch/search/MockSearchService.java
@@ -32,7 +32,7 @@
package org.opensearch.search;
-import org.opensearch.arrow.StreamManager;
+import org.opensearch.arrow.spi.StreamManager;
import org.opensearch.cluster.service.ClusterService;
import org.opensearch.common.util.BigArrays;
import org.opensearch.core.indices.breaker.CircuitBreakerService;
diff --git a/test/framework/src/main/java/org/opensearch/test/TestSearchContext.java b/test/framework/src/main/java/org/opensearch/test/TestSearchContext.java
index be864594088f1..932b493d6222d 100644
--- a/test/framework/src/main/java/org/opensearch/test/TestSearchContext.java
+++ b/test/framework/src/main/java/org/opensearch/test/TestSearchContext.java
@@ -38,7 +38,7 @@
import org.opensearch.action.OriginalIndices;
import org.opensearch.action.search.SearchShardTask;
import org.opensearch.action.search.SearchType;
-import org.opensearch.arrow.StreamManager;
+import org.opensearch.arrow.spi.StreamManager;
import org.opensearch.common.unit.TimeValue;
import org.opensearch.common.util.BigArrays;
import org.opensearch.core.index.shard.ShardId;