rebase master and pr feedback

apache · Oct 9, 2022 · d90fcf0 · d90fcf0
1 parent 72215f1
commit d90fcf0
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 14 deletions.
diff --git a/.github/workflows/cpp.yml b/.github/workflows/cpp.yml
@@ -182,9 +182,7 @@ jobs:
           key: cpp-ccache-macos-${{ hashFiles('cpp/**') }}
           restore-keys: cpp-ccache-macos-
       - name: Build
-        # pin LLVM version on MacOS to 14 ARROW-17902
         run: |
-          export LLVM_ROOT=$(brew --prefix llvm@14)
           ci/scripts/cpp_build.sh $(pwd) $(pwd)/build
       - name: Test
         shell: bash

diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
@@ -167,9 +167,7 @@ jobs:
             -r python/requirements-test.txt
       - name: Build
         shell: bash
-        # pin LLVM version on MacOS to 14 ARROW-17902
         run: |
-          export LLVM_ROOT=$(brew --prefix llvm@14)
           export PYTHON=python3
           ci/scripts/cpp_build.sh $(pwd) $(pwd)/build
           ci/scripts/python_build.sh $(pwd) $(pwd)/build

diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
@@ -169,9 +169,7 @@ jobs:
           key: ruby-ccache-macos-${{ hashFiles('cpp/**') }}
           restore-keys: ruby-ccache-macos-
       - name: Build C++
-        # pin LLVM version on MacOS to 14 ARROW-17902
         run: |
-          export LLVM_ROOT=$(brew --prefix llvm@14)
           ci/scripts/cpp_build.sh $(pwd) $(pwd)/build
       - name: Build GLib
         run: |

diff --git a/dev/tasks/java-jars/github.yml b/dev/tasks/java-jars/github.yml
@@ -69,9 +69,7 @@ jobs:
         run: |
           arrow/ci/scripts/ccache_setup.sh
       - name: Build C++ libraries
-        # pin LLVM version on MacOS to 14 ARROW-17902
         run: |
-          export LLVM_ROOT=$(brew --prefix llvm@14)
           set -e
           arrow/ci/scripts/java_jni_macos_build.sh \
             $GITHUB_WORKSPACE/arrow \

diff --git a/dev/tasks/verify-rc/github.macos.amd64.yml b/dev/tasks/verify-rc/github.macos.amd64.yml
@@ -70,9 +70,5 @@ jobs:
         {% if use_conda %}
           USE_CONDA: 1
         {% endif %}
-        # pin LLVM version on MacOS to 14 ARROW-17902
         run: |
-        {% if not use_conda %}
-          export LLVM_ROOT=$(brew --prefix llvm@14)
-        {% endif %}
           arrow/dev/release/verify-release-candidate.sh {{ release|default("") }} {{ rc|default("") }}
diff --git a/java/gandiva/src/main/cpp/jni_common.cc b/java/gandiva/src/main/cpp/jni_common.cc
@@ -15,7 +15,6 @@
 // specific language governing permissions and limitations
 // under the License.
 
-#include <arrow/status.h>
 #include <google/protobuf/io/coded_stream.h>
 
 #include <map>
@@ -28,6 +27,7 @@
 
 #include <arrow/builder.h>
 #include <arrow/record_batch.h>
+#include <arrow/status.h>
 #include <arrow/type.h>
 #include <gandiva/configuration.h>
 #include <gandiva/decimal_scalar.h>
@@ -744,7 +744,7 @@ Status JavaResizableBuffer::Resize(const int64_t new_size, bool shrink_to_fit) {
     return Status::NotImplemented("shrink not implemented");
   }
 
-  if (ARROW_PREDICT_TRUE(new_size < capacity())) {
+  if (ARROW_PREDICT_TRUE(new_size <= capacity())) {
     // no need to expand.
     size_ = new_size;
     return Status::OK();