* Upgrade presets for Arrow 4.0.0

CHANGELOG.md

@@ -8,7 +8,7 @@
  * Map `std::vector<cv::Range>` to `RangeVector` in `opencv_core.Mat` for convenience ([issue bytedeco/javacv#1607](https://github.com/bytedeco/javacv/issues/1607))
  * Include `genericaliasobject.h`, `context.h`, `tracemalloc.h`, and `datetime.h` for CPython ([issue #1017](https://github.com/bytedeco/javacpp-presets/issues/1017))
  * Add samples using LLVM modules to deal with bitcode and object files ([pull #1016](https://github.com/bytedeco/javacpp-presets/pull/1016))
- * Upgrade presets for OpenCV 4.5.2, FFmpeg 4.4 ([pull #1030](https://github.com/bytedeco/javacpp-presets/pull/1030)), librealsense2 2.44.0 ([pull #1031](https://github.com/bytedeco/javacpp-presets/pull/1031)), MKL 2021.2, OpenBLAS 0.3.14, DNNL 2.2.1, CPython 3.9.4, NumPy 1.20.2, SciPy 1.6.2, Gym 0.18.1, LLVM 12.0.0 ([pull #1029](https://github.com/bytedeco/javacpp-presets/pull/1029)), CUDA 11.3.0, NCCL 2.9.6, ONNX 1.9.0
+ * Upgrade presets for OpenCV 4.5.2, FFmpeg 4.4 ([pull #1030](https://github.com/bytedeco/javacpp-presets/pull/1030)), Arrow 4.0.0, librealsense2 2.44.0 ([pull #1031](https://github.com/bytedeco/javacpp-presets/pull/1031)), MKL 2021.2, OpenBLAS 0.3.14, DNNL 2.2.1, CPython 3.9.4, NumPy 1.20.2, SciPy 1.6.2, Gym 0.18.1, LLVM 12.0.0 ([pull #1029](https://github.com/bytedeco/javacpp-presets/pull/1029)), CUDA 11.3.0, NCCL 2.9.6, ONNX 1.9.0
 
 ### March 8, 2021 version 1.5.5
  * Bundle LLD executable in presets for LLVM as required by TVM on Windows

README.md

@@ -179,7 +179,7 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip
  * ARToolKitPlus 2.3.1  https://launchpad.net/artoolkitplus
  * Chilitags  https://github.com/chili-epfl/chilitags
  * flandmark 1.07  https://github.com/uricamic/flandmark
- * Arrow 3.0.0  https://arrow.apache.org/install/
+ * Arrow 4.0.0  https://arrow.apache.org/install/
  * HDF5 1.12.0  https://www.hdfgroup.org/downloads/
  * Hyperscan 5.4.x  https://github.com/intel/hyperscan
  * MKL 2021.x  https://software.intel.com/mkl

arrow/README.md

@@ -9,7 +9,7 @@ Introduction
 ------------
 This directory contains the JavaCPP Presets module for:
 
- * Arrow 3.0.0  https://arrow.apache.org/
+ * Arrow 4.0.0  https://arrow.apache.org/
 
 Please refer to the parent README.md file for more detailed information about the JavaCPP Presets.
 
@@ -25,7 +25,7 @@ Sample Usage
 ------------
 Here is a simple example of Arrow ported to Java from this C++ source file:
 
- * https://github.com/apache/arrow/blob/apache-arrow-3.0.0/cpp/examples/arrow/row-wise-conversion-example.cc
+ * https://github.com/apache/arrow/blob/apache-arrow-4.0.0/cpp/examples/arrow/row_wise_conversion_example.cc
 
 We can use [Maven 3](http://maven.apache.org/) to download and install automatically all the class files as well as the native binaries. To run this sample code, after creating the `pom.xml` and `SimpleExample.java` source files below, simply execute on the command line:
 ```bash
@@ -38,15 +38,15 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.bytedeco.arrow</groupId>
     <artifactId>row-wise-conversion-example</artifactId>
-    <version>1.5.5</version>
+    <version>1.5.6-SNAPSHOT</version>
     <properties>
         <exec.mainClass>RowWiseConversionExample</exec.mainClass>
     </properties>
     <dependencies>
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>arrow-platform</artifactId>
-            <version>3.0.0-1.5.5</version>
+            <version>4.0.0-1.5.6-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>

arrow/cppbuild.sh

@@ -12,11 +12,11 @@ if [[ $PLATFORM == windows* ]]; then
     export PYTHON_BIN_PATH=$(which python.exe)
 fi
 
-LLVM_VERSION=11.1.0
+LLVM_VERSION=12.0.0
 OPENSSL_VERSION=1.1.1k
 ZLIB_VERSION=1.2.11
 PROTO_VERSION=3.13.0
-ARROW_VERSION=3.0.0
+ARROW_VERSION=4.0.0
 download https://github.com/llvm/llvm-project/releases/download/llvmorg-$LLVM_VERSION/llvm-$LLVM_VERSION.src.tar.xz llvm-$LLVM_VERSION.src.tar.xz
 download https://github.com/llvm/llvm-project/releases/download/llvmorg-$LLVM_VERSION/clang-$LLVM_VERSION.src.tar.xz clang-$LLVM_VERSION.src.tar.xz
 download https://github.com/python/cpython-bin-deps/archive/openssl-bin.zip cpython-bin-deps-openssl-bin.zip
@@ -36,6 +36,7 @@ tar --totals -xzf ../openssl-$OPENSSL_VERSION.tar.gz
 tar --totals -xf ../llvm-$LLVM_VERSION.src.tar.xz || tar --totals -xf ../llvm-$LLVM_VERSION.src.tar.xz
 cd apache-arrow-$ARROW_VERSION
 patch -Np1 < ../../../arrow.patch
+sedinplace 's/PlatformToolset=v140/PlatformToolset=v142/g' cpp/cmake_modules/ThirdpartyToolchain.cmake
 sedinplace 's/ARROW_LLVM_VERSIONS "10"/ARROW_LLVM_VERSIONS "11" "10"/g' cpp/CMakeLists.txt
 cd ../llvm-$LLVM_VERSION.src
 sedinplace '/find_package(Git/d' cmake/modules/AddLLVM.cmake cmake/modules/VersionFromVCS.cmake
@@ -222,4 +223,9 @@ case $PLATFORM in
         ;;
 esac
 
+# work around link issues on Windows
+echo "extern template class arrow::Future<std::shared_ptr<arrow::RecordBatch> >;"  >> ../../include/arrow/dataset/scanner.h
+echo "extern template class arrow::Future<arrow::dataset::TaggedRecordBatch>;"     >> ../../include/arrow/dataset/scanner.h
+echo "extern template class arrow::Future<arrow::dataset::EnumeratedRecordBatch>;" >> ../../include/arrow/dataset/scanner.h
+
 cd ../../..

arrow/platform/pom.xml

@@ -12,7 +12,7 @@
 
   <groupId>org.bytedeco</groupId>
   <artifactId>arrow-platform</artifactId>
-  <version>3.0.0-${project.parent.version}</version>
+  <version>4.0.0-${project.parent.version}</version>
   <name>JavaCPP Presets Platform for Arrow</name>
 
   <properties>

arrow/pom.xml

@@ -11,7 +11,7 @@
 
   <groupId>org.bytedeco</groupId>
   <artifactId>arrow</artifactId>
-  <version>3.0.0-${project.parent.version}</version>
+  <version>4.0.0-${project.parent.version}</version>
   <name>JavaCPP Presets for Arrow</name>
 
   <dependencies>

arrow/samples/pom.xml

@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.bytedeco.arrow</groupId>
     <artifactId>row-wise-conversion-example</artifactId>
-    <version>1.5.5</version>
+    <version>1.5.6-SNAPSHOT</version>
     <properties>
         <exec.mainClass>RowWiseConversionExample</exec.mainClass>
         <maven.compiler.source>1.7</maven.compiler.source>
@@ -12,7 +12,7 @@
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>arrow-platform</artifactId>
-            <version>3.0.0-1.5.5</version>
+            <version>4.0.0-1.5.6-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>

arrow/src/gen/java/org/bytedeco/arrow/Aggregate.java

@@ -0,0 +1,39 @@
+// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE
+
+package org.bytedeco.arrow;
+
+import org.bytedeco.arrow.Function;
+import java.nio.*;
+import org.bytedeco.javacpp.*;
+import org.bytedeco.javacpp.annotation.*;
+
+import static org.bytedeco.javacpp.presets.javacpp.*;
+
+import static org.bytedeco.arrow.global.arrow.*;
+
+
+/** \brief Configure a grouped aggregation */
+@Namespace("arrow::compute::internal") @Properties(inherit = org.bytedeco.arrow.presets.arrow.class)
+public class Aggregate extends Pointer {
+    static { Loader.load(); }
+    /** Default native constructor. */
+    public Aggregate() { super((Pointer)null); allocate(); }
+    /** Native array allocator. Access with {@link Pointer#position(long)}. */
+    public Aggregate(long size) { super((Pointer)null); allocateArray(size); }
+    /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
+    public Aggregate(Pointer p) { super(p); }
+    private native void allocate();
+    private native void allocateArray(long size);
+    @Override public Aggregate position(long position) {
+        return (Aggregate)super.position(position);
+    }
+    @Override public Aggregate getPointer(long i) {
+        return new Aggregate((Pointer)this).offsetAddress(i);
+    }
+
+  /** the name of the aggregation function */
+  public native @StdString String function(); public native Aggregate function(String setter);
+
+  /** options for the aggregation function */
+  public native @Const FunctionOptions options(); public native Aggregate options(FunctionOptions setter);
+}

arrow/src/gen/java/org/bytedeco/arrow/ArithmeticOptions.java

@@ -1,7 +1,8 @@
-// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.arrow;
 
+import org.bytedeco.arrow.Function;
 import java.nio.*;
 import org.bytedeco.javacpp.*;
 import org.bytedeco.javacpp.annotation.*;
@@ -27,7 +28,7 @@ public class ArithmeticOptions extends FunctionOptions {
         return (ArithmeticOptions)super.position(position);
     }
     @Override public ArithmeticOptions getPointer(long i) {
-        return new ArithmeticOptions((Pointer)this).position(position + i);
+        return new ArithmeticOptions((Pointer)this).offsetAddress(i);
     }
 
   public ArithmeticOptions() { super((Pointer)null); allocate(); }

arrow/src/gen/java/org/bytedeco/arrow/Arity.java

@@ -1,7 +1,8 @@
-// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.arrow;
 
+import org.bytedeco.arrow.Function;
 import java.nio.*;
 import org.bytedeco.javacpp.*;
 import org.bytedeco.javacpp.annotation.*;
@@ -26,7 +27,7 @@ public class Arity extends Pointer {
         return (Arity)super.position(position);
     }
     @Override public Arity getPointer(long i) {
-        return new Arity((Pointer)this).position(position + i);
+        return new Arity((Pointer)this).offsetAddress(i);
     }
 
   /** \brief A function taking no arguments */

arrow/src/gen/java/org/bytedeco/arrow/Array.java

@@ -1,7 +1,8 @@
-// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.arrow;
 
+import org.bytedeco.arrow.Function;
 import java.nio.*;
 import org.bytedeco.javacpp.*;
 import org.bytedeco.javacpp.annotation.*;

arrow/src/gen/java/org/bytedeco/arrow/ArrayBuilder.java

@@ -1,7 +1,8 @@
-// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.arrow;
 
+import org.bytedeco.arrow.Function;
 import java.nio.*;
 import org.bytedeco.javacpp.*;
 import org.bytedeco.javacpp.annotation.*;

arrow/src/gen/java/org/bytedeco/arrow/ArrayBuilderVector.java

@@ -1,7 +1,8 @@
-// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.arrow;
 
+import org.bytedeco.arrow.Function;
 import java.nio.*;
 import org.bytedeco.javacpp.*;
 import org.bytedeco.javacpp.annotation.*;

arrow/src/gen/java/org/bytedeco/arrow/ArrayData.java

@@ -1,7 +1,8 @@
-// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.arrow;
 
+import org.bytedeco.arrow.Function;
 import java.nio.*;
 import org.bytedeco.javacpp.*;
 import org.bytedeco.javacpp.annotation.*;
@@ -57,7 +58,7 @@ public class ArrayData extends Pointer {
         return (ArrayData)super.position(position);
     }
     @Override public ArrayData getPointer(long i) {
-        return new ArrayData((Pointer)this).position(position + i);
+        return new ArrayData((Pointer)this).offsetAddress(i);
     }
 
   public ArrayData() { super((Pointer)null); allocate(); }

arrow/src/gen/java/org/bytedeco/arrow/ArrayDataResult.java

@@ -1,7 +1,8 @@
-// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.arrow;
 
+import org.bytedeco.arrow.Function;
 import java.nio.*;
 import org.bytedeco.javacpp.*;
 import org.bytedeco.javacpp.annotation.*;
@@ -22,7 +23,7 @@ public class ArrayDataResult extends Pointer {
         return (ArrayDataResult)super.position(position);
     }
     @Override public ArrayDataResult getPointer(long i) {
-        return new ArrayDataResult((Pointer)this).position(position + i);
+        return new ArrayDataResult((Pointer)this).offsetAddress(i);
     }
 
 
@@ -181,10 +182,11 @@ public class ArrayDataResult extends Pointer {
    * 
    *  @return The stored {@code T} value. */
   public native @SharedPtr @ByRef ArrayData ValueOrDie();
+  public native @SharedPtr @ByRef @Name("operator *") ArrayData multiply();
 
   ///
   ///
-  public native @SharedPtr @ByRef @Name("operator *") ArrayData multiply();
+  public native @SharedPtr @Name("operator ->") ArrayData access();
 
   /** Moves and returns the internally-stored {@code T} value.
    * 

arrow/src/gen/java/org/bytedeco/arrow/ArrayDataVector.java

@@ -1,7 +1,8 @@
-// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.arrow;
 
+import org.bytedeco.arrow.Function;
 import java.nio.*;
 import org.bytedeco.javacpp.*;
 import org.bytedeco.javacpp.annotation.*;

arrow/src/gen/java/org/bytedeco/arrow/ArrayKernel.java

@@ -1,7 +1,8 @@
-// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.arrow;
 
+import org.bytedeco.arrow.Function;
 import java.nio.*;
 import org.bytedeco.javacpp.*;
 import org.bytedeco.javacpp.annotation.*;
@@ -27,7 +28,7 @@ public class ArrayKernel extends Kernel {
         return (ArrayKernel)super.position(position);
     }
     @Override public ArrayKernel getPointer(long i) {
-        return new ArrayKernel((Pointer)this).position(position + i);
+        return new ArrayKernel((Pointer)this).offsetAddress(i);
     }
 
   public ArrayKernel() { super((Pointer)null); allocate(); }

arrow/src/gen/java/org/bytedeco/arrow/ArrayResult.java

@@ -1,7 +1,8 @@
-// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.arrow;
 
+import org.bytedeco.arrow.Function;
 import java.nio.*;
 import org.bytedeco.javacpp.*;
 import org.bytedeco.javacpp.annotation.*;
@@ -22,7 +23,7 @@ public class ArrayResult extends Pointer {
         return (ArrayResult)super.position(position);
     }
     @Override public ArrayResult getPointer(long i) {
-        return new ArrayResult((Pointer)this).position(position + i);
+        return new ArrayResult((Pointer)this).offsetAddress(i);
     }
 
 
@@ -181,10 +182,11 @@ public class ArrayResult extends Pointer {
    * 
    *  @return The stored {@code T} value. */
   public native @SharedPtr @ByRef Array ValueOrDie();
+  public native @SharedPtr @ByRef @Name("operator *") Array multiply();
 
   ///
   ///
-  public native @SharedPtr @ByRef @Name("operator *") Array multiply();
+  public native @SharedPtr @Name("operator ->") Array access();
 
   /** Moves and returns the internally-stored {@code T} value.
    * 

arrow/src/gen/java/org/bytedeco/arrow/ArraySortOptions.java

@@ -1,7 +1,8 @@
-// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.arrow;
 
+import org.bytedeco.arrow.Function;
 import java.nio.*;
 import org.bytedeco.javacpp.*;
 import org.bytedeco.javacpp.annotation.*;
@@ -23,7 +24,7 @@ public class ArraySortOptions extends FunctionOptions {
         return (ArraySortOptions)super.position(position);
     }
     @Override public ArraySortOptions getPointer(long i) {
-        return new ArraySortOptions((Pointer)this).position(position + i);
+        return new ArraySortOptions((Pointer)this).offsetAddress(i);
     }
 
   public ArraySortOptions(SortOrder order/*=arrow::compute::SortOrder::Ascending*/) { super((Pointer)null); allocate(order); }

arrow/src/gen/java/org/bytedeco/arrow/ArrayVector.java

@@ -1,7 +1,8 @@
-// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.arrow;
 
+import org.bytedeco.arrow.Function;
 import java.nio.*;
 import org.bytedeco.javacpp.*;
 import org.bytedeco.javacpp.annotation.*;