-
Notifications
You must be signed in to change notification settings - Fork 4k
GH-39000: [Java] Build arrow-memory-netty as a JPMS module #39012
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Draft
jduo
wants to merge
30
commits into
apache:main
Choose a base branch
from
Bit-Quill:netty-modularization
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
30 commits
Select commit
Hold shift + click to select a range
e82e47e
Add and integrate the module-info compiler plugin
jduo c1c6330
Fix JDK8 compile issue with module-info-compiler and attempt to fix a…
jduo c5eaceb
Fix JDK8 issue with use of Path.of
jduo 1b73e24
Skip the maven-dependency-plugin analyze check due to false positive
jduo 9894c92
Fix non-inherited version
jduo 348011b
Do not use dependency analyze when compiling plugins
jduo 50fe6d7
Exclude module-info.java from compilation
jduo 06f5805
Exclude module-info.java files from checkstyle
jduo 65bb84e
Add skip parameter and logging to module info compiler plugin
jduo 807ee9a
Add module-info.java files for format and vector
jduo ce20098
Move arrow-vector tests to use a different package
jduo ba88814
Explicitly have arrow-vector depend on immutables
jduo e14c3cd
Export packages for arrow-vector module
jduo 8484c63
Fix a missed reference to moved arrow-vector test classes
jduo 869d85a
Fix CData related test failures
jduo 83bab66
Have arrow-vector depend on jdk.unsupported
jduo 04b4912
Refactor memory modules for JPMS support
jduo 6ce9844
Add module-info for memory-core and memory-unsafe
jduo b83498c
Ignore TestBaseAllocator#testRootAllocator_getEmpty
jduo b682dda
Edit TestArrowBuf#testEnabledHistoricalLog to have more info
jduo a794812
Allow use of reflection on Unsafe from memory-core
jduo a36130c
Provide better error message about needing memory-core to have access…
jduo 57dd151
Allow memory-core to use reflection on memory-unsafe
jduo e3e7077
Add explicit dependency on immutables to memory-unsafe
jduo 478446a
Enable reflection during arrow-memory-core tests
jduo c792b63
Fix occasionally ConcurrentModificationException in Netty tests
jduo 4e4a6ba
Add netty module-info.java
jduo 0d44ba1
Update the surefire command line to for Netty modules
jduo 0d9d03d
Allow memory-core to use reflection on memory-netty
jduo 7a9ba6f
Restructure Netty tests for modules
jduo File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You 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. | ||
| */ | ||
|
|
||
| module org.apache.arrow.format { | ||
| exports org.apache.arrow.flatbuf; | ||
| requires transitive flatbuffers.java; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,130 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor | ||
| license agreements. See the NOTICE file distributed with this work for additional | ||
| information regarding copyright ownership. The ASF licenses this file to | ||
| You 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. --> | ||
| <project xmlns="http://maven.apache.org/POM/4.0.0" | ||
| xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
| <modelVersion>4.0.0</modelVersion> | ||
| <parent> | ||
| <groupId>org.apache.arrow.maven.plugins</groupId> | ||
| <artifactId>arrow-maven-plugins</artifactId> | ||
| <version>15.0.0-SNAPSHOT</version> | ||
| </parent> | ||
| <artifactId>module-info-compiler-maven-plugin</artifactId> | ||
| <packaging>maven-plugin</packaging> | ||
|
|
||
| <name>Module Info Compiler Maven Plugin</name> | ||
|
|
||
| <url>https://arrow.apache.org</url> | ||
|
|
||
| <prerequisites> | ||
| <maven>${maven.version}</maven> | ||
| </prerequisites> | ||
|
|
||
| <properties> | ||
| <maven.version>3.3.9</maven.version> | ||
| </properties> | ||
|
|
||
| <dependencies> | ||
| <dependency> | ||
| <groupId>org.glavo</groupId> | ||
| <artifactId>module-info-compiler</artifactId> | ||
| <version>2.0</version> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.apache.maven</groupId> | ||
| <artifactId>maven-plugin-api</artifactId> | ||
| <version>${maven.version}</version> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.apache.maven</groupId> | ||
| <artifactId>maven-core</artifactId> | ||
| <version>${maven.version}</version> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.apache.maven</groupId> | ||
| <artifactId>maven-artifact</artifactId> | ||
| <version>${maven.version}</version> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.apache.maven</groupId> | ||
| <artifactId>maven-model</artifactId> | ||
| <version>${maven.version}</version> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
| <dependency> | ||
| <groupId>org.apache.maven.plugin-tools</groupId> | ||
| <artifactId>maven-plugin-annotations</artifactId> | ||
| <version>3.6.0</version> | ||
| <scope>provided</scope> | ||
| </dependency> | ||
| </dependencies> | ||
|
|
||
| <build> | ||
| <pluginManagement><!-- lock down plugins versions to avoid using Maven defaults (may be moved to parent pom) --> | ||
| <plugins> | ||
| <plugin> | ||
| <artifactId>maven-clean-plugin</artifactId> | ||
| <version>3.1.0</version> | ||
| </plugin> | ||
| <plugin> | ||
| <artifactId>maven-plugin-plugin</artifactId> | ||
| <version>3.6.0</version> | ||
| </plugin> | ||
| <plugin> | ||
| <artifactId>maven-jar-plugin</artifactId> | ||
| <version>3.0.2</version> | ||
| </plugin> | ||
| <plugin> | ||
| <artifactId>maven-install-plugin</artifactId> | ||
| <version>2.5.2</version> | ||
| </plugin> | ||
| <plugin> | ||
| <artifactId>maven-deploy-plugin</artifactId> | ||
| <version>2.8.2</version> | ||
| </plugin> | ||
| <plugin> | ||
| <artifactId>maven-invoker-plugin</artifactId> | ||
| <version>3.1.0</version> | ||
| </plugin> | ||
| </plugins> | ||
| </pluginManagement> | ||
| <plugins> | ||
| <plugin> | ||
| <groupId>org.apache.maven.plugins</groupId> | ||
| <artifactId>maven-plugin-plugin</artifactId> | ||
| <version>3.6.0</version> | ||
| <configuration> | ||
| <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound> | ||
| </configuration> | ||
| <executions> | ||
| <execution> | ||
| <id>mojo-descriptor</id> | ||
| <goals> | ||
| <goal>descriptor</goal> | ||
| </goals> | ||
| </execution> | ||
| <execution> | ||
| <id>help-goal</id> | ||
| <goals> | ||
| <goal>helpmojo</goal> | ||
| </goals> | ||
| </execution> | ||
| </executions> | ||
| </plugin> | ||
| </plugins> | ||
| </build> | ||
|
|
||
|
|
||
| </project> | ||
105 changes: 105 additions & 0 deletions
105
...r-maven-plugin/src/main/java/org/apache/arrow/maven/plugins/ModuleInfoCompilerPlugin.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,105 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You 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. | ||
| */ | ||
|
|
||
| package org.apache.arrow.maven.plugins; | ||
|
|
||
| import java.io.File; | ||
| import java.io.IOException; | ||
| import java.io.InputStreamReader; | ||
| import java.io.OutputStream; | ||
| import java.io.Reader; | ||
| import java.nio.charset.StandardCharsets; | ||
| import java.nio.file.Files; | ||
| import java.nio.file.Path; | ||
| import java.nio.file.Paths; | ||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
| import java.util.Optional; | ||
|
|
||
| import org.apache.maven.plugin.AbstractMojo; | ||
| import org.apache.maven.plugin.MojoExecutionException; | ||
| import org.apache.maven.plugins.annotations.LifecyclePhase; | ||
| import org.apache.maven.plugins.annotations.Mojo; | ||
| import org.apache.maven.plugins.annotations.Parameter; | ||
| import org.apache.maven.project.MavenProject; | ||
| import org.glavo.mic.ModuleInfoCompiler; | ||
|
|
||
| /** | ||
| * Compiles the first module-info.java file in the project purely syntactically. | ||
| */ | ||
| @Mojo(name = "module-info-compile", defaultPhase = LifecyclePhase.COMPILE) | ||
| public class ModuleInfoCompilerPlugin extends AbstractMojo { | ||
| /** | ||
| * Source directories. | ||
| */ | ||
| @Parameter(defaultValue = "${project.compileSourceRoots}", property = "compileSourceRoots", | ||
| required = true) | ||
| private final List<String> compileSourceRoots = new ArrayList<>(); | ||
|
|
||
| @Parameter(defaultValue = "false", property = "skip", required = false) | ||
| private boolean skip = false; | ||
|
|
||
| @Parameter(defaultValue = "${project}", readonly = true, required = true) | ||
| private MavenProject project; | ||
|
|
||
| @Override | ||
| public void execute() throws MojoExecutionException { | ||
| if (skip) { | ||
| getLog().info("Skipping module-info-compiler-maven-plugin"); | ||
| return; | ||
| } | ||
|
|
||
| Optional<File> moduleInfoFile = findFirstModuleInfo(compileSourceRoots); | ||
| if (moduleInfoFile.isPresent()) { | ||
| // The compiled module-info.class file goes into target/classes/module-info/main | ||
| Path outputDir = Paths.get(project.getBuild().getOutputDirectory()); | ||
|
|
||
| outputDir.toFile().mkdirs(); | ||
| Path targetPath = outputDir.resolve("module-info.class"); | ||
|
|
||
| // Invoke the compiler, | ||
| ModuleInfoCompiler compiler = new ModuleInfoCompiler(); | ||
| try (Reader reader = new InputStreamReader(Files.newInputStream(moduleInfoFile.get().toPath()), | ||
| StandardCharsets.UTF_8); | ||
| OutputStream output = Files.newOutputStream(targetPath)) { | ||
| compiler.compile(reader, output); | ||
| getLog().info("Successfully wrote module-info.class file."); | ||
| } catch (IOException ex) { | ||
| throw new MojoExecutionException("Error compiling module-info.java", ex); | ||
| } | ||
| } else { | ||
| getLog().info("No module-info.java file found. module-info.class file was not generated."); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Finds the first module-info.java file in the set of source directories. | ||
| */ | ||
| private Optional<File> findFirstModuleInfo(List<String> sourceDirectories) { | ||
| if (sourceDirectories == null) { | ||
| return Optional.empty(); | ||
| } | ||
|
|
||
| return sourceDirectories.stream().map(Paths::get) | ||
| .map(sourcePath -> | ||
| sourcePath.toFile().listFiles(file -> | ||
| file.getName().equals("module-info.java"))) | ||
| .filter(matchingFiles -> matchingFiles != null && matchingFiles.length != 0) | ||
| .map(matchingFiles -> matchingFiles[0]) | ||
| .findAny(); | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
new line maybe?