This is an automated email from the ASF dual-hosted git repository.
chengpan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kyuubi.git
The following commit(s) were added to refs/heads/master by this push:
new 8c5fadf6d [KYUUBI #5266] Upgrade playground to Kyuubi 1.7.1
8c5fadf6d is described below
commit 8c5fadf6d013baa359feaae228e83bf5b66b4e61
Author: Cheng Pan <[email protected]>
AuthorDate: Mon Sep 11 11:13:05 2023 +0000
[KYUUBI #5266] Upgrade playground to Kyuubi 1.7.1
### _Why are the changes needed?_
Upgrade to latest Kyuubi in playground.
### _How was this patch tested?_
- [ ] Add some test cases that check the changes thoroughly including
negative and positive cases if possible
Successfully published docker image via `BUILDX=1
docker/playground/build-image.sh`
- [ ] Add screenshots for manual tests if appropriate
- [ ] [Run
test](https://kyuubi.readthedocs.io/en/master/contributing/code/testing.html#running-tests)
locally before make a pull request
### _Was this patch authored or co-authored using generative AI tooling?_
No.
Closes #5266 from pan3793/playground-171.
Closes #5266
17015e4d9 [Cheng Pan] remove iceberg catalog
a060f7067 [Cheng Pan] spark 3.3.3
c3176049b [Cheng Pan] fix
b11d0bb0f [Cheng Pan] nit
dc6a2b905 [Cheng Pan] Upgrade playground to Kyuubi 1.7.1
Authored-by: Cheng Pan <[email protected]>
Signed-off-by: Cheng Pan <[email protected]>
---
docker/playground/.env | 12 ++++++------
docker/playground/compose.yml | 2 +-
docker/playground/conf/kyuubi-defaults.conf | 2 +-
docker/playground/conf/spark-defaults.conf | 4 ----
docker/playground/image/kyuubi-playground-base.Dockerfile | 2 +-
5 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/docker/playground/.env b/docker/playground/.env
index ea2145511..bb666e1e4 100644
--- a/docker/playground/.env
+++ b/docker/playground/.env
@@ -15,16 +15,16 @@
# limitations under the License.
#
-AWS_JAVA_SDK_VERSION=1.12.316
-HADOOP_VERSION=3.3.5
+AWS_JAVA_SDK_VERSION=1.12.367
+HADOOP_VERSION=3.3.6
HIVE_VERSION=2.3.9
-ICEBERG_VERSION=1.2.0
-KYUUBI_VERSION=1.7.0
-KYUUBI_HADOOP_VERSION=3.3.4
+ICEBERG_VERSION=1.3.1
+KYUUBI_VERSION=1.7.1
+KYUUBI_HADOOP_VERSION=3.3.5
POSTGRES_VERSION=12
POSTGRES_JDBC_VERSION=42.3.4
SCALA_BINARY_VERSION=2.12
-SPARK_VERSION=3.3.2
+SPARK_VERSION=3.3.3
SPARK_BINARY_VERSION=3.3
SPARK_HADOOP_VERSION=3.3.2
ZOOKEEPER_VERSION=3.6.3
diff --git a/docker/playground/compose.yml b/docker/playground/compose.yml
index b0d2b1ea8..362b3505b 100644
--- a/docker/playground/compose.yml
+++ b/docker/playground/compose.yml
@@ -21,7 +21,7 @@ services:
environment:
MINIO_ROOT_USER: minio
MINIO_ROOT_PASSWORD: minio_minio
- MINIO_DEFAULT_BUCKETS: spark-bucket,iceberg-bucket
+ MINIO_DEFAULT_BUCKETS: spark-bucket
container_name: minio
hostname: minio
ports:
diff --git a/docker/playground/conf/kyuubi-defaults.conf
b/docker/playground/conf/kyuubi-defaults.conf
index 15b3fbf6e..e4a674634 100644
--- a/docker/playground/conf/kyuubi-defaults.conf
+++ b/docker/playground/conf/kyuubi-defaults.conf
@@ -30,4 +30,4 @@ kyuubi.operation.progress.enabled=true
kyuubi.engine.session.initialize.sql \
show namespaces in tpcds; \
show namespaces in tpch; \
- show namespaces in postgres;
+ show namespaces in postgres
diff --git a/docker/playground/conf/spark-defaults.conf
b/docker/playground/conf/spark-defaults.conf
index 9d1d4a602..7983b5e70 100644
--- a/docker/playground/conf/spark-defaults.conf
+++ b/docker/playground/conf/spark-defaults.conf
@@ -38,7 +38,3 @@
spark.sql.catalog.postgres.url=jdbc:postgresql://postgres:5432/metastore
spark.sql.catalog.postgres.driver=org.postgresql.Driver
spark.sql.catalog.postgres.user=postgres
spark.sql.catalog.postgres.password=postgres
-
-spark.sql.catalog.iceberg=org.apache.iceberg.spark.SparkCatalog
-spark.sql.catalog.iceberg.type=hadoop
-spark.sql.catalog.iceberg.warehouse=s3a://iceberg-bucket/iceberg-warehouse
diff --git a/docker/playground/image/kyuubi-playground-base.Dockerfile
b/docker/playground/image/kyuubi-playground-base.Dockerfile
index 6ee4ed405..e8375eb68 100644
--- a/docker/playground/image/kyuubi-playground-base.Dockerfile
+++ b/docker/playground/image/kyuubi-playground-base.Dockerfile
@@ -20,4 +20,4 @@ RUN set -x && \
mkdir /opt/busybox && \
busybox --install /opt/busybox
-ENV
PATH=/opt/java/openjdk/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/busybox
+ENV PATH=${PATH}:/opt/busybox
