Skip to content

Commit 207d328

Browse files
authored
ARROW-16832: [C++] Remove hiveserver2 related codes entirely (#13400)
This is a follow-up of #13382. Authored-by: Sutou Kouhei <kou@clear-code.com> Signed-off-by: Sutou Kouhei <kou@clear-code.com>
1 parent 4ade394 commit 207d328

File tree

5 files changed

+2
-72
lines changed

5 files changed

+2
-72
lines changed

ci/conan/all/conanfile.py

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ class ArrowConan(ConanFile):
6060
"with_gflags": ["auto", True, False],
6161
"with_glog": ["auto", True, False],
6262
"with_grpc": ["auto", True, False],
63-
"with_hiveserver2": [True, False],
6463
"with_jemalloc": ["auto", True, False],
6564
"with_json": [True, False],
6665
"with_llvm": ["auto", True, False],
@@ -103,7 +102,6 @@ class ArrowConan(ConanFile):
103102
"with_jemalloc": "auto",
104103
"with_glog": "auto",
105104
"with_grpc": "auto",
106-
"with_hiveserver2": False,
107105
"with_json": False,
108106
"with_llvm": "auto",
109107
"with_openssl": "auto",
@@ -164,8 +162,6 @@ def validate(self):
164162
raise ConanInvalidConfiguration("with_openssl options is required (or choose auto)")
165163
if self.options.with_cuda:
166164
raise ConanInvalidConfiguration("CCI has no cuda recipe (yet)")
167-
if self.options.with_hiveserver2:
168-
raise ConanInvalidConfiguration("CCI has no hiveserver2 recipe (yet)")
169165
if self.options.with_orc:
170166
raise ConanInvalidConfiguration("CCI has no orc recipe (yet)")
171167
if self.options.with_s3 and not self.options["aws-sdk-cpp"].config:
@@ -237,7 +233,7 @@ def _with_boost(self, required=False):
237233

238234
def _with_thrift(self, required=False):
239235
# No self.options.with_thift exists
240-
return bool(required or self.options.with_hiveserver2 or self.options.parquet)
236+
return bool(required or self.options.parquet)
241237

242238
def _with_utf8proc(self, required=False):
243239
if required or self.options.with_utf8proc == "auto":
@@ -356,7 +352,6 @@ def _configure_cmake(self):
356352
self._cmake.definitions["ARROW_BUILD_STATIC"] = not self.options.shared
357353
self._cmake.definitions["ARROW_NO_DEPRECATED_API"] = not self.options.deprecated
358354
self._cmake.definitions["ARROW_FLIGHT"] = self.options.with_flight_rpc
359-
self._cmake.definitions["ARROW_HIVESERVER2"] = self.options.with_hiveserver2
360355
self._cmake.definitions["ARROW_COMPUTE"] = self._compute()
361356
self._cmake.definitions["ARROW_CSV"] = self.options.with_csv
362357
self._cmake.definitions["ARROW_CUDA"] = self.options.with_cuda
@@ -561,8 +556,6 @@ def package_info(self):
561556
self.cpp_info.components["libarrow"].requires.append("libbacktrace::libbacktrace")
562557
if self.options.with_cuda:
563558
self.cpp_info.components["libarrow"].requires.append("cuda::cuda")
564-
if self.options.with_hiveserver2:
565-
self.cpp_info.components["libarrow"].requires.append("hiveserver2::hiveserver2")
566559
if self.options.with_json:
567560
self.cpp_info.components["libarrow"].requires.append("rapidjson::rapidjson")
568561
if self.options.with_s3:

ci/scripts/cpp_build.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ cmake \
9595
-DARROW_GANDIVA=${ARROW_GANDIVA:-OFF} \
9696
-DARROW_GCS=${ARROW_GCS:-OFF} \
9797
-DARROW_HDFS=${ARROW_HDFS:-ON} \
98-
-DARROW_HIVESERVER2=${ARROW_HIVESERVER2:-OFF} \
9998
-DARROW_INSTALL_NAME_RPATH=${ARROW_INSTALL_NAME_RPATH:-ON} \
10099
-DARROW_JEMALLOC=${ARROW_JEMALLOC:-ON} \
101100
-DARROW_JNI=${ARROW_JNI:-OFF} \

ci/scripts/integration_hiveserver2.sh

Lines changed: 0 additions & 32 deletions
This file was deleted.

dev/tasks/tasks.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1563,13 +1563,6 @@ tasks:
15631563
fetch_depth: 0
15641564
{% endfor %}
15651565

1566-
# Remove the "skipped-" prefix in ARROW-8475
1567-
skipped-test-conda-cpp-hiveserver2:
1568-
ci: github
1569-
template: docker-tests/github.linux.yml
1570-
params:
1571-
image: conda-cpp-hiveserver2
1572-
15731566
{% for kind in ["static", "static-system-dependency"] %}
15741567
example-cpp-minimal-build-{{ kind }}:
15751568
ci: github

docker-compose.yml

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ x-hierarchy:
100100
- conda:
101101
- conda-cpp:
102102
- conda-integration
103-
- conda-cpp-hiveserver2
104103
- conda-cpp-valgrind
105104
- conda-python:
106105
- conda-python-pandas:
@@ -1677,7 +1676,7 @@ services:
16771676
POSTGRES_PASSWORD: postgres
16781677

16791678
impala:
1680-
# required for the hiveserver and hdfs tests
1679+
# required for the hdfs tests
16811680
image: ibisproject/impala:latest
16821681
hostname: impala
16831682
links:
@@ -1700,28 +1699,6 @@ services:
17001699
- 25010:25010
17011700
- 25020:25020
17021701

1703-
conda-cpp-hiveserver2:
1704-
# Usage:
1705-
# docker-compose build conda-cpp
1706-
# docker-compose build conda-cpp-hiveserver2
1707-
# docker-compose run conda-cpp-hiveserver2
1708-
image: ${REPO}:${ARCH}-conda-cpp
1709-
links:
1710-
- impala:impala
1711-
environment:
1712-
<<: *ccache
1713-
ARROW_FLIGHT: "OFF"
1714-
ARROW_FLIGHT_SQL: "OFF"
1715-
ARROW_GANDIVA: "OFF"
1716-
ARROW_PLASMA: "OFF"
1717-
ARROW_HIVESERVER2: "ON"
1718-
ARROW_HIVESERVER2_TEST_HOST: impala
1719-
shm_size: *shm-size
1720-
volumes: *conda-volumes
1721-
command:
1722-
["/arrow/ci/scripts/cpp_build.sh /arrow /build &&
1723-
/arrow/ci/scripts/integration_hiveserver2.sh /arrow /build"]
1724-
17251702
conda-python-hdfs:
17261703
# Usage:
17271704
# docker-compose build conda-cpp

0 commit comments

Comments
 (0)