diff --git a/gandiva/pom.xml b/gandiva/pom.xml index 349ccccc8..b016ddd67 100644 --- a/gandiva/pom.xml +++ b/gandiva/pom.xml @@ -37,10 +37,6 @@ under the License. - - org.apache.arrow - arrow-format - org.apache.arrow arrow-memory-core diff --git a/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/FunctionSignature.java b/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/FunctionSignature.java index 66a795723..164b6aaac 100644 --- a/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/FunctionSignature.java +++ b/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/FunctionSignature.java @@ -18,8 +18,6 @@ import com.google.common.base.MoreObjects; import com.google.common.base.Objects; - -import java.util.ArrayList; import java.util.List; import org.apache.arrow.vector.types.pojo.ArrowType; diff --git a/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/JniLoader.java b/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/JniLoader.java index 3cb8ef6b9..5c59c219e 100644 --- a/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/JniLoader.java +++ b/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/JniLoader.java @@ -18,6 +18,8 @@ import static java.util.UUID.randomUUID; +import com.sun.jna.Library; +import com.sun.jna.NativeLibrary; import java.io.File; import java.io.IOException; import java.io.InputStream; @@ -29,15 +31,12 @@ import java.util.concurrent.ConcurrentMap; import org.apache.arrow.gandiva.exceptions.GandivaException; -import com.sun.jna.Library; -import com.sun.jna.NativeLibrary; - /** This class handles loading of the jni library, and acts as a bridge for the native functions. */ class JniLoader { private static final String LIBRARY_NAME = "gandiva_jni"; - + private static final int RTLD_GLOBAL = 0x00100; - private static final int RTLD_LAZY = 0x00001; + private static final int RTLD_LAZY = 0x00001; private static volatile JniLoader INSTANCE; private static volatile long defaultConfiguration = 0L; @@ -78,8 +77,7 @@ private static void loadGandivaLibraryFromJar(final String tmpDir) final File libraryFile = moveFileFromJarToTemp(tmpDir, libraryToLoad, LIBRARY_NAME); NativeLibrary.getInstance( libraryFile.getAbsolutePath(), - Collections.singletonMap(Library.OPTION_OPEN_FLAGS, new Integer(RTLD_LAZY | RTLD_GLOBAL)) - ); + Collections.singletonMap(Library.OPTION_OPEN_FLAGS, new Integer(RTLD_LAZY | RTLD_GLOBAL))); System.load(libraryFile.getAbsolutePath()); } diff --git a/gandiva/src/main/java/org/apache/arrow/gandiva/expression/FunctionNode.java b/gandiva/src/main/java/org/apache/arrow/gandiva/expression/FunctionNode.java index d88dcb564..a5c6fb77f 100644 --- a/gandiva/src/main/java/org/apache/arrow/gandiva/expression/FunctionNode.java +++ b/gandiva/src/main/java/org/apache/arrow/gandiva/expression/FunctionNode.java @@ -17,8 +17,6 @@ package org.apache.arrow.gandiva.expression; import java.util.List; - -import org.apache.arrow.flatbuf.Type; import org.apache.arrow.gandiva.exceptions.GandivaException; import org.apache.arrow.gandiva.ipc.GandivaTypes; import org.apache.arrow.vector.types.pojo.ArrowType;