Skip to content

Commit 4bf8d81

Browse files
committed
Dremio updates
1 parent 26bfa18 commit 4bf8d81

4 files changed

Lines changed: 5 additions & 15 deletions

File tree

gandiva/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,6 @@ under the License.
3737
</properties>
3838

3939
<dependencies>
40-
<dependency>
41-
<groupId>org.apache.arrow</groupId>
42-
<artifactId>arrow-format</artifactId>
43-
</dependency>
4440
<dependency>
4541
<groupId>org.apache.arrow</groupId>
4642
<artifactId>arrow-memory-core</artifactId>

gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/FunctionSignature.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818

1919
import com.google.common.base.MoreObjects;
2020
import com.google.common.base.Objects;
21-
22-
import java.util.ArrayList;
2321
import java.util.List;
2422
import org.apache.arrow.vector.types.pojo.ArrowType;
2523

gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/JniLoader.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818

1919
import static java.util.UUID.randomUUID;
2020

21+
import com.sun.jna.Library;
22+
import com.sun.jna.NativeLibrary;
2123
import java.io.File;
2224
import java.io.IOException;
2325
import java.io.InputStream;
@@ -29,15 +31,12 @@
2931
import java.util.concurrent.ConcurrentMap;
3032
import org.apache.arrow.gandiva.exceptions.GandivaException;
3133

32-
import com.sun.jna.Library;
33-
import com.sun.jna.NativeLibrary;
34-
3534
/** This class handles loading of the jni library, and acts as a bridge for the native functions. */
3635
class JniLoader {
3736
private static final String LIBRARY_NAME = "gandiva_jni";
38-
37+
3938
private static final int RTLD_GLOBAL = 0x00100;
40-
private static final int RTLD_LAZY = 0x00001;
39+
private static final int RTLD_LAZY = 0x00001;
4140

4241
private static volatile JniLoader INSTANCE;
4342
private static volatile long defaultConfiguration = 0L;
@@ -78,8 +77,7 @@ private static void loadGandivaLibraryFromJar(final String tmpDir)
7877
final File libraryFile = moveFileFromJarToTemp(tmpDir, libraryToLoad, LIBRARY_NAME);
7978
NativeLibrary.getInstance(
8079
libraryFile.getAbsolutePath(),
81-
Collections.singletonMap(Library.OPTION_OPEN_FLAGS, new Integer(RTLD_LAZY | RTLD_GLOBAL))
82-
);
80+
Collections.singletonMap(Library.OPTION_OPEN_FLAGS, new Integer(RTLD_LAZY | RTLD_GLOBAL)));
8381
System.load(libraryFile.getAbsolutePath());
8482
}
8583

gandiva/src/main/java/org/apache/arrow/gandiva/expression/FunctionNode.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
package org.apache.arrow.gandiva.expression;
1818

1919
import java.util.List;
20-
21-
import org.apache.arrow.flatbuf.Type;
2220
import org.apache.arrow.gandiva.exceptions.GandivaException;
2321
import org.apache.arrow.gandiva.ipc.GandivaTypes;
2422
import org.apache.arrow.vector.types.pojo.ArrowType;

0 commit comments

Comments
 (0)