Skip to content

Commit 80e7b52

Browse files
committed
make use of extendedPlugins provide runtime dependencies for arrow-memrory-core
Signed-off-by: Rishabh Maurya <[email protected]>
1 parent 6a24a55 commit 80e7b52

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+751
-102
lines changed

Diff for: .idea/runConfigurations/Debug_OpenSearch.xml

-11
This file was deleted.

Diff for: distribution/src/config/jvm.options

+1
Original file line numberDiff line numberDiff line change
@@ -89,3 +89,4 @@ ${error.file}
8989
# See please https://bugs.openjdk.org/browse/JDK-8341127 (openjdk/jdk#21283)
9090
23:-XX:CompileCommand=dontinline,java/lang/invoke/MethodHandle.setAsTypeCache
9191
23:-XX:CompileCommand=dontinline,java/lang/invoke/MethodHandle.asTypeUncached
92+
21-:--add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED

Diff for: gradle/run.gradle

+8
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,17 @@ testClusters {
4343
installedPlugins = Eval.me(installedPlugins)
4444
for (String p : installedPlugins) {
4545
plugin('plugins:'.concat(p))
46+
if (p.equals("arrow-flight-rpc")) {
47+
// Add system properties for Netty configuration
48+
systemProperty 'io.netty.allocator.numDirectArenas', '1'
49+
systemProperty 'io.netty.noUnsafe', 'false'
50+
systemProperty 'io.netty.tryUnsafe', 'true'
51+
systemProperty 'io.netty.tryReflectionSetAccessible', 'true'
52+
}
4653
}
4754
}
4855
}
56+
4957
}
5058

5159
tasks.register("run", RunTask) {

Diff for: modules/opensearch-arrow-core/build.gradle

+122
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,122 @@
1+
/*
2+
* SPDX-License-Identifier: Apache-2.0
3+
*
4+
* The OpenSearch Contributors require contributions made to
5+
* this file be licensed under the Apache-2.0 license or a
6+
* compatible open source license.
7+
*
8+
* Modifications Copyright OpenSearch Contributors. See
9+
* GitHub history for details.
10+
*/
11+
12+
13+
opensearchplugin {
14+
description = 'Arrow vector and memory dependencies; meant to be used as an extended-plugin to get required classes ' +
15+
'at runtime classloader; consumers should take a compile time dependencies.'
16+
classname = 'org.opensearch.arrow.core.ArrowCorePlugin'
17+
}
18+
19+
testingConventions.enabled = false
20+
21+
dependencies {
22+
api "org.apache.arrow:arrow-memory-netty:${versions.arrow}"
23+
api "org.apache.arrow:arrow-memory-core:${versions.arrow}"
24+
api "org.apache.arrow:arrow-memory-netty-buffer-patch:${versions.arrow}"
25+
api "io.netty:netty-buffer:${versions.netty}"
26+
api "io.netty:netty-common:${versions.netty}"
27+
api "org.apache.arrow:arrow-vector:${versions.arrow}"
28+
api "org.apache.arrow:arrow-format:${versions.arrow}"
29+
30+
compileOnly 'org.checkerframework:checker-qual:3.44.0'
31+
api "com.google.flatbuffers:flatbuffers-java:${versions.flatbuffers}"
32+
api "org.slf4j:slf4j-api:${versions.slf4j}"
33+
api "com.fasterxml.jackson.core:jackson-core:${versions.jackson}"
34+
api "com.fasterxml.jackson.core:jackson-databind:${versions.jackson}"
35+
api "com.fasterxml.jackson.core:jackson-annotations:${versions.jackson}"
36+
api "commons-codec:commons-codec:${versions.commonscodec}"
37+
}
38+
39+
tasks.named("dependencyLicenses").configure {
40+
mapping from: /netty-.*/, to: 'netty'
41+
mapping from: /grpc-.*/, to: 'grpc'
42+
mapping from: /jackson-.*/, to: 'jackson'
43+
}
44+
45+
tasks.named('forbiddenApisMain').configure {
46+
replaceSignatureFiles 'jdk-signatures'
47+
48+
excludes = [
49+
'org/apache/arrow/flight/OSFlightServer$Builder.class',
50+
'org/apache/arrow/flight/OSFlightClient$Builder.class',
51+
'org/opensearch/flight/bootstrap/server/ServerConfig$Netty4Configs.class',
52+
'org/opensearch/flight/bootstrap/server/ServerConfig.class',
53+
'org/opensearch/flight/bootstrap/tls/DefaultSslContextProvider.class',
54+
'org/apache/arrow/flight/OpenSearchFlightClient$Builder.class'
55+
]
56+
}
57+
58+
59+
tasks.named('thirdPartyAudit').configure {
60+
ignoreMissingClasses(
61+
'org.apache.commons.logging.Log',
62+
'org.apache.commons.logging.LogFactory',
63+
64+
'org.slf4j.impl.StaticLoggerBinder',
65+
'org.slf4j.impl.StaticMDCBinder',
66+
'org.slf4j.impl.StaticMarkerBinder',
67+
68+
// from Log4j (deliberate, Netty will fallback to Log4j 2)
69+
'org.apache.log4j.Level',
70+
'org.apache.log4j.Logger',
71+
72+
'reactor.blockhound.BlockHound$Builder',
73+
'reactor.blockhound.integration.BlockHoundIntegration',
74+
)
75+
ignoreViolations(
76+
'io.netty.util.internal.PlatformDependent0',
77+
'io.netty.util.internal.PlatformDependent0$1',
78+
'io.netty.util.internal.PlatformDependent0$2',
79+
'io.netty.util.internal.PlatformDependent0$3',
80+
'io.netty.util.internal.PlatformDependent0$4',
81+
'io.netty.util.internal.PlatformDependent0$6',
82+
'io.netty.util.internal.shaded.org.jctools.queues.BaseLinkedQueueConsumerNodeRef',
83+
'io.netty.util.internal.shaded.org.jctools.queues.BaseLinkedQueueProducerNodeRef',
84+
'io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueueColdProducerFields',
85+
'io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueueConsumerFields',
86+
'io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueueProducerFields',
87+
'io.netty.util.internal.shaded.org.jctools.queues.LinkedQueueNode',
88+
'io.netty.util.internal.shaded.org.jctools.queues.MpmcArrayQueueConsumerIndexField',
89+
'io.netty.util.internal.shaded.org.jctools.queues.MpmcArrayQueueProducerIndexField',
90+
'io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueConsumerIndexField',
91+
'io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueProducerIndexField',
92+
'io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueProducerLimitField',
93+
'io.netty.util.internal.shaded.org.jctools.util.UnsafeAccess',
94+
'io.netty.util.internal.shaded.org.jctools.util.UnsafeLongArrayAccess',
95+
'io.netty.util.internal.shaded.org.jctools.util.UnsafeRefArrayAccess',
96+
'io.netty.util.internal.PlatformDependent0',
97+
'io.netty.util.internal.PlatformDependent0$1',
98+
'io.netty.util.internal.PlatformDependent0$2',
99+
'io.netty.util.internal.PlatformDependent0$3',
100+
'io.netty.util.internal.PlatformDependent0$4',
101+
'io.netty.util.internal.PlatformDependent0$6',
102+
'io.netty.util.internal.shaded.org.jctools.queues.BaseLinkedQueueConsumerNodeRef',
103+
'io.netty.util.internal.shaded.org.jctools.queues.BaseLinkedQueueProducerNodeRef',
104+
'io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueueColdProducerFields',
105+
'io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueueConsumerFields',
106+
'io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueueProducerFields',
107+
'io.netty.util.internal.shaded.org.jctools.queues.LinkedQueueNode',
108+
'io.netty.util.internal.shaded.org.jctools.queues.MpmcArrayQueueConsumerIndexField',
109+
'io.netty.util.internal.shaded.org.jctools.queues.MpmcArrayQueueProducerIndexField',
110+
'io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueConsumerIndexField',
111+
'io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueProducerIndexField',
112+
'io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueProducerLimitField',
113+
'io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueConsumerIndexField',
114+
'io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueProducerIndexField',
115+
'io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueProducerLimitField',
116+
'io.netty.util.internal.shaded.org.jctools.util.UnsafeAccess',
117+
'io.netty.util.internal.shaded.org.jctools.util.UnsafeLongArrayAccess',
118+
'io.netty.util.internal.shaded.org.jctools.util.UnsafeRefArrayAccess',
119+
'org.apache.arrow.memory.util.MemoryUtil',
120+
'org.apache.arrow.memory.util.MemoryUtil$1'
121+
)
122+
}
+202
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,202 @@
1+
2+
Apache License
3+
Version 2.0, January 2004
4+
http://www.apache.org/licenses/
5+
6+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
7+
8+
1. Definitions.
9+
10+
"License" shall mean the terms and conditions for use, reproduction,
11+
and distribution as defined by Sections 1 through 9 of this document.
12+
13+
"Licensor" shall mean the copyright owner or entity authorized by
14+
the copyright owner that is granting the License.
15+
16+
"Legal Entity" shall mean the union of the acting entity and all
17+
other entities that control, are controlled by, or are under common
18+
control with that entity. For the purposes of this definition,
19+
"control" means (i) the power, direct or indirect, to cause the
20+
direction or management of such entity, whether by contract or
21+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
22+
outstanding shares, or (iii) beneficial ownership of such entity.
23+
24+
"You" (or "Your") shall mean an individual or Legal Entity
25+
exercising permissions granted by this License.
26+
27+
"Source" form shall mean the preferred form for making modifications,
28+
including but not limited to software source code, documentation
29+
source, and configuration files.
30+
31+
"Object" form shall mean any form resulting from mechanical
32+
transformation or translation of a Source form, including but
33+
not limited to compiled object code, generated documentation,
34+
and conversions to other media types.
35+
36+
"Work" shall mean the work of authorship, whether in Source or
37+
Object form, made available under the License, as indicated by a
38+
copyright notice that is included in or attached to the work
39+
(an example is provided in the Appendix below).
40+
41+
"Derivative Works" shall mean any work, whether in Source or Object
42+
form, that is based on (or derived from) the Work and for which the
43+
editorial revisions, annotations, elaborations, or other modifications
44+
represent, as a whole, an original work of authorship. For the purposes
45+
of this License, Derivative Works shall not include works that remain
46+
separable from, or merely link (or bind by name) to the interfaces of,
47+
the Work and Derivative Works thereof.
48+
49+
"Contribution" shall mean any work of authorship, including
50+
the original version of the Work and any modifications or additions
51+
to that Work or Derivative Works thereof, that is intentionally
52+
submitted to Licensor for inclusion in the Work by the copyright owner
53+
or by an individual or Legal Entity authorized to submit on behalf of
54+
the copyright owner. For the purposes of this definition, "submitted"
55+
means any form of electronic, verbal, or written communication sent
56+
to the Licensor or its representatives, including but not limited to
57+
communication on electronic mailing lists, source code control systems,
58+
and issue tracking systems that are managed by, or on behalf of, the
59+
Licensor for the purpose of discussing and improving the Work, but
60+
excluding communication that is conspicuously marked or otherwise
61+
designated in writing by the copyright owner as "Not a Contribution."
62+
63+
"Contributor" shall mean Licensor and any individual or Legal Entity
64+
on behalf of whom a Contribution has been received by Licensor and
65+
subsequently incorporated within the Work.
66+
67+
2. Grant of Copyright License. Subject to the terms and conditions of
68+
this License, each Contributor hereby grants to You a perpetual,
69+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
70+
copyright license to reproduce, prepare Derivative Works of,
71+
publicly display, publicly perform, sublicense, and distribute the
72+
Work and such Derivative Works in Source or Object form.
73+
74+
3. Grant of Patent License. Subject to the terms and conditions of
75+
this License, each Contributor hereby grants to You a perpetual,
76+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
77+
(except as stated in this section) patent license to make, have made,
78+
use, offer to sell, sell, import, and otherwise transfer the Work,
79+
where such license applies only to those patent claims licensable
80+
by such Contributor that are necessarily infringed by their
81+
Contribution(s) alone or by combination of their Contribution(s)
82+
with the Work to which such Contribution(s) was submitted. If You
83+
institute patent litigation against any entity (including a
84+
cross-claim or counterclaim in a lawsuit) alleging that the Work
85+
or a Contribution incorporated within the Work constitutes direct
86+
or contributory patent infringement, then any patent licenses
87+
granted to You under this License for that Work shall terminate
88+
as of the date such litigation is filed.
89+
90+
4. Redistribution. You may reproduce and distribute copies of the
91+
Work or Derivative Works thereof in any medium, with or without
92+
modifications, and in Source or Object form, provided that You
93+
meet the following conditions:
94+
95+
(a) You must give any other recipients of the Work or
96+
Derivative Works a copy of this License; and
97+
98+
(b) You must cause any modified files to carry prominent notices
99+
stating that You changed the files; and
100+
101+
(c) You must retain, in the Source form of any Derivative Works
102+
that You distribute, all copyright, patent, trademark, and
103+
attribution notices from the Source form of the Work,
104+
excluding those notices that do not pertain to any part of
105+
the Derivative Works; and
106+
107+
(d) If the Work includes a "NOTICE" text file as part of its
108+
distribution, then any Derivative Works that You distribute must
109+
include a readable copy of the attribution notices contained
110+
within such NOTICE file, excluding those notices that do not
111+
pertain to any part of the Derivative Works, in at least one
112+
of the following places: within a NOTICE text file distributed
113+
as part of the Derivative Works; within the Source form or
114+
documentation, if provided along with the Derivative Works; or,
115+
within a display generated by the Derivative Works, if and
116+
wherever such third-party notices normally appear. The contents
117+
of the NOTICE file are for informational purposes only and
118+
do not modify the License. You may add Your own attribution
119+
notices within Derivative Works that You distribute, alongside
120+
or as an addendum to the NOTICE text from the Work, provided
121+
that such additional attribution notices cannot be construed
122+
as modifying the License.
123+
124+
You may add Your own copyright statement to Your modifications and
125+
may provide additional or different license terms and conditions
126+
for use, reproduction, or distribution of Your modifications, or
127+
for any such Derivative Works as a whole, provided Your use,
128+
reproduction, and distribution of the Work otherwise complies with
129+
the conditions stated in this License.
130+
131+
5. Submission of Contributions. Unless You explicitly state otherwise,
132+
any Contribution intentionally submitted for inclusion in the Work
133+
by You to the Licensor shall be under the terms and conditions of
134+
this License, without any additional terms or conditions.
135+
Notwithstanding the above, nothing herein shall supersede or modify
136+
the terms of any separate license agreement you may have executed
137+
with Licensor regarding such Contributions.
138+
139+
6. Trademarks. This License does not grant permission to use the trade
140+
names, trademarks, service marks, or product names of the Licensor,
141+
except as required for reasonable and customary use in describing the
142+
origin of the Work and reproducing the content of the NOTICE file.
143+
144+
7. Disclaimer of Warranty. Unless required by applicable law or
145+
agreed to in writing, Licensor provides the Work (and each
146+
Contributor provides its Contributions) on an "AS IS" BASIS,
147+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
148+
implied, including, without limitation, any warranties or conditions
149+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
150+
PARTICULAR PURPOSE. You are solely responsible for determining the
151+
appropriateness of using or redistributing the Work and assume any
152+
risks associated with Your exercise of permissions under this License.
153+
154+
8. Limitation of Liability. In no event and under no legal theory,
155+
whether in tort (including negligence), contract, or otherwise,
156+
unless required by applicable law (such as deliberate and grossly
157+
negligent acts) or agreed to in writing, shall any Contributor be
158+
liable to You for damages, including any direct, indirect, special,
159+
incidental, or consequential damages of any character arising as a
160+
result of this License or out of the use or inability to use the
161+
Work (including but not limited to damages for loss of goodwill,
162+
work stoppage, computer failure or malfunction, or any and all
163+
other commercial damages or losses), even if such Contributor
164+
has been advised of the possibility of such damages.
165+
166+
9. Accepting Warranty or Additional Liability. While redistributing
167+
the Work or Derivative Works thereof, You may choose to offer,
168+
and charge a fee for, acceptance of support, warranty, indemnity,
169+
or other liability obligations and/or rights consistent with this
170+
License. However, in accepting such obligations, You may act only
171+
on Your own behalf and on Your sole responsibility, not on behalf
172+
of any other Contributor, and only if You agree to indemnify,
173+
defend, and hold each Contributor harmless for any liability
174+
incurred by, or claims asserted against, such Contributor by reason
175+
of your accepting any such warranty or additional liability.
176+
177+
END OF TERMS AND CONDITIONS
178+
179+
APPENDIX: How to apply the Apache License to your work.
180+
181+
To apply the Apache License to your work, attach the following
182+
boilerplate notice, with the fields enclosed by brackets "[]"
183+
replaced with your own identifying information. (Don't include
184+
the brackets!) The text should be enclosed in the appropriate
185+
comment syntax for the file format. We also recommend that a
186+
file or class name and description of purpose be included on the
187+
same "printed page" as the copyright notice for easier
188+
identification within third-party archives.
189+
190+
Copyright [yyyy] [name of copyright owner]
191+
192+
Licensed under the Apache License, Version 2.0 (the "License");
193+
you may not use this file except in compliance with the License.
194+
You may obtain a copy of the License at
195+
196+
http://www.apache.org/licenses/LICENSE-2.0
197+
198+
Unless required by applicable law or agreed to in writing, software
199+
distributed under the License is distributed on an "AS IS" BASIS,
200+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
201+
See the License for the specific language governing permissions and
202+
limitations under the License.

0 commit comments

Comments
 (0)