backport patches to 1.3 branch (apache#67)

* Support casting boolean to bigint (apache#60) * remove log4j as it's not used (apache#61) Signed-off-by: Yuan Zhou <[email protected]> * Add stripe iteration support for batch_size reading in the ORC Scanner (apache#63) * Install re2 headers (apache#66) Co-authored-by: PHILO-HE <[email protected]> Co-authored-by: zhixingheyi-tian <[email protected]>
zhouyuan · Dec 30, 2021 · 58ad5d9 · 58ad5d9
1 parent 7d34575
commit 58ad5d9
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 12 deletions.
diff --git a/cpp/cmake_modules/ThirdpartyToolchain.cmake b/cpp/cmake_modules/ThirdpartyToolchain.cmake
@@ -2178,6 +2178,9 @@ macro(build_re2)
  set(RE2_INCLUDE_DIR "${RE2_PREFIX}/include")
 
  list(APPEND ARROW_BUNDLED_STATIC_LIBS re2::re2)
+
+ # Install re2 headers for gazelle native code use.
+ install(DIRECTORY "${RE2_INCLUDE_DIR}/re2" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
 endmacro()
 
 if(ARROW_WITH_RE2)

diff --git a/cpp/src/gandiva/function_registry_arithmetic.cc b/cpp/src/gandiva/function_registry_arithmetic.cc
@@ -40,6 +40,7 @@ std::vector<NativeFunction> GetArithmeticFunctionRegistry() {
  UNARY_SAFE_NULL_IF_NULL(castBIGINT, {}, float32, int64),
  UNARY_SAFE_NULL_IF_NULL(castBIGINT, {}, float64, int64),
  UNARY_SAFE_NULL_IF_NULL(castBIGINT, {}, date64, int64),
+ UNARY_SAFE_NULL_IF_NULL(castBIGINT, {}, boolean, int64),
  UNARY_SAFE_NULL_IF_NULL(castINT, {}, int8, int32),
  UNARY_SAFE_NULL_IF_NULL(castINT, {}, int16, int32),
  UNARY_SAFE_NULL_IF_NULL(castINT, {}, int64, int32),

diff --git a/cpp/src/gandiva/precompiled/arithmetic_ops.cc b/cpp/src/gandiva/precompiled/arithmetic_ops.cc
@@ -169,6 +169,7 @@ CAST_UNARY(castBIGINT, int32, int64)
 CAST_UNARY(castBIGINT, date64, int64)
 CAST_UNARY(castBIGINT, float32, int64)
 CAST_UNARY(castBIGINT, float64, int64)
+CAST_UNARY(castBIGINT, boolean, int64)
 CAST_UNARY(castINT, int8, int32)
 CAST_UNARY(castINT, int16, int32)
 CAST_UNARY(castINT, int64, int32)

diff --git a/java/performance/pom.xml b/java/performance/pom.xml
@@ -33,18 +33,6 @@
  <version>${jmh.version}</version>
  <scope>provided</scope>
  </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- <version>2.1</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <version>2.1</version>
- <scope>runtime</scope>
- </dependency>
  <dependency>
  <groupId>org.apache.arrow</groupId>
  <artifactId>arrow-vector</artifactId>