This is an automated email from the ASF dual-hosted git repository.
kou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new 207d328565 ARROW-16832: [C++] Remove hiveserver2 related codes
entirely (#13400)
207d328565 is described below
commit 207d328565b65b2c916ec17bc57f29b0c6fc8e8f
Author: Sutou Kouhei <[email protected]>
AuthorDate: Mon Jun 20 10:51:06 2022 +0900
ARROW-16832: [C++] Remove hiveserver2 related codes entirely (#13400)
This is a follow-up of #13382.
Authored-by: Sutou Kouhei <[email protected]>
Signed-off-by: Sutou Kouhei <[email protected]>
---
ci/conan/all/conanfile.py | 9 +--------
ci/scripts/cpp_build.sh | 1 -
ci/scripts/integration_hiveserver2.sh | 32 --------------------------------
dev/tasks/tasks.yml | 7 -------
docker-compose.yml | 25 +------------------------
5 files changed, 2 insertions(+), 72 deletions(-)
diff --git a/ci/conan/all/conanfile.py b/ci/conan/all/conanfile.py
index a0695baa70..0d82d98db3 100644
--- a/ci/conan/all/conanfile.py
+++ b/ci/conan/all/conanfile.py
@@ -60,7 +60,6 @@ class ArrowConan(ConanFile):
"with_gflags": ["auto", True, False],
"with_glog": ["auto", True, False],
"with_grpc": ["auto", True, False],
- "with_hiveserver2": [True, False],
"with_jemalloc": ["auto", True, False],
"with_json": [True, False],
"with_llvm": ["auto", True, False],
@@ -103,7 +102,6 @@ class ArrowConan(ConanFile):
"with_jemalloc": "auto",
"with_glog": "auto",
"with_grpc": "auto",
- "with_hiveserver2": False,
"with_json": False,
"with_llvm": "auto",
"with_openssl": "auto",
@@ -164,8 +162,6 @@ class ArrowConan(ConanFile):
raise ConanInvalidConfiguration("with_openssl options is required
(or choose auto)")
if self.options.with_cuda:
raise ConanInvalidConfiguration("CCI has no cuda recipe (yet)")
- if self.options.with_hiveserver2:
- raise ConanInvalidConfiguration("CCI has no hiveserver2 recipe
(yet)")
if self.options.with_orc:
raise ConanInvalidConfiguration("CCI has no orc recipe (yet)")
if self.options.with_s3 and not self.options["aws-sdk-cpp"].config:
@@ -237,7 +233,7 @@ class ArrowConan(ConanFile):
def _with_thrift(self, required=False):
# No self.options.with_thift exists
- return bool(required or self.options.with_hiveserver2 or
self.options.parquet)
+ return bool(required or self.options.parquet)
def _with_utf8proc(self, required=False):
if required or self.options.with_utf8proc == "auto":
@@ -356,7 +352,6 @@ class ArrowConan(ConanFile):
self._cmake.definitions["ARROW_BUILD_STATIC"] = not self.options.shared
self._cmake.definitions["ARROW_NO_DEPRECATED_API"] = not
self.options.deprecated
self._cmake.definitions["ARROW_FLIGHT"] = self.options.with_flight_rpc
- self._cmake.definitions["ARROW_HIVESERVER2"] =
self.options.with_hiveserver2
self._cmake.definitions["ARROW_COMPUTE"] = self._compute()
self._cmake.definitions["ARROW_CSV"] = self.options.with_csv
self._cmake.definitions["ARROW_CUDA"] = self.options.with_cuda
@@ -561,8 +556,6 @@ class ArrowConan(ConanFile):
self.cpp_info.components["libarrow"].requires.append("libbacktrace::libbacktrace")
if self.options.with_cuda:
self.cpp_info.components["libarrow"].requires.append("cuda::cuda")
- if self.options.with_hiveserver2:
-
self.cpp_info.components["libarrow"].requires.append("hiveserver2::hiveserver2")
if self.options.with_json:
self.cpp_info.components["libarrow"].requires.append("rapidjson::rapidjson")
if self.options.with_s3:
diff --git a/ci/scripts/cpp_build.sh b/ci/scripts/cpp_build.sh
index 8e823b0539..bac8acaade 100755
--- a/ci/scripts/cpp_build.sh
+++ b/ci/scripts/cpp_build.sh
@@ -95,7 +95,6 @@ cmake \
-DARROW_GANDIVA=${ARROW_GANDIVA:-OFF} \
-DARROW_GCS=${ARROW_GCS:-OFF} \
-DARROW_HDFS=${ARROW_HDFS:-ON} \
- -DARROW_HIVESERVER2=${ARROW_HIVESERVER2:-OFF} \
-DARROW_INSTALL_NAME_RPATH=${ARROW_INSTALL_NAME_RPATH:-ON} \
-DARROW_JEMALLOC=${ARROW_JEMALLOC:-ON} \
-DARROW_JNI=${ARROW_JNI:-OFF} \
diff --git a/ci/scripts/integration_hiveserver2.sh
b/ci/scripts/integration_hiveserver2.sh
deleted file mode 100755
index 36fba5ca8d..0000000000
--- a/ci/scripts/integration_hiveserver2.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/usr/bin/env bash
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-set -e
-
-arrow_dir=${1}
-source_dir=${1}/cpp
-build_dir=${2}/cpp
-
-${arrow_dir}/ci/scripts/util_wait_for_it.sh impala:21050 -t 300 -s -- echo
"impala is up"
-
-pushd ${build_dir}
-
-# ninja hiveserver2-test
-debug/hiveserver2-test
-
-popd
diff --git a/dev/tasks/tasks.yml b/dev/tasks/tasks.yml
index 3a4eff43ab..73e2257f19 100644
--- a/dev/tasks/tasks.yml
+++ b/dev/tasks/tasks.yml
@@ -1563,13 +1563,6 @@ tasks:
fetch_depth: 0
{% endfor %}
- # Remove the "skipped-" prefix in ARROW-8475
- skipped-test-conda-cpp-hiveserver2:
- ci: github
- template: docker-tests/github.linux.yml
- params:
- image: conda-cpp-hiveserver2
-
{% for kind in ["static", "static-system-dependency"] %}
example-cpp-minimal-build-{{ kind }}:
ci: github
diff --git a/docker-compose.yml b/docker-compose.yml
index 6ae62a5ae4..b23f88e4cc 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -100,7 +100,6 @@ x-hierarchy:
- conda:
- conda-cpp:
- conda-integration
- - conda-cpp-hiveserver2
- conda-cpp-valgrind
- conda-python:
- conda-python-pandas:
@@ -1677,7 +1676,7 @@ services:
POSTGRES_PASSWORD: postgres
impala:
- # required for the hiveserver and hdfs tests
+ # required for the hdfs tests
image: ibisproject/impala:latest
hostname: impala
links:
@@ -1700,28 +1699,6 @@ services:
- 25010:25010
- 25020:25020
- conda-cpp-hiveserver2:
- # Usage:
- # docker-compose build conda-cpp
- # docker-compose build conda-cpp-hiveserver2
- # docker-compose run conda-cpp-hiveserver2
- image: ${REPO}:${ARCH}-conda-cpp
- links:
- - impala:impala
- environment:
- <<: *ccache
- ARROW_FLIGHT: "OFF"
- ARROW_FLIGHT_SQL: "OFF"
- ARROW_GANDIVA: "OFF"
- ARROW_PLASMA: "OFF"
- ARROW_HIVESERVER2: "ON"
- ARROW_HIVESERVER2_TEST_HOST: impala
- shm_size: *shm-size
- volumes: *conda-volumes
- command:
- ["/arrow/ci/scripts/cpp_build.sh /arrow /build &&
- /arrow/ci/scripts/integration_hiveserver2.sh /arrow /build"]
-
conda-python-hdfs:
# Usage:
# docker-compose build conda-cpp
