You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kyuubi.apache.org by ch...@apache.org on 2026/07/13 09:43:30 UTC
(kyuubi) branch branch-1.11 updated: [KYUUBI #7562] [INFRA] Remove gluten integration test module
This is an automated email from the ASF dual-hosted git repository.
pan3793 pushed a commit to branch branch-1.11
in repository https://gitbox.apache.org/repos/asf/kyuubi.git
The following commit(s) were added to refs/heads/branch-1.11 by this push:
new a33bbf1377 [KYUUBI #7562] [INFRA] Remove gluten integration test module
a33bbf1377 is described below
commit a33bbf1377cc685ccb275c97b8778af79d6e8d4e
Author: Cheng Pan <ch...@apache.org>
AuthorDate: Mon Jul 13 17:42:26 2026 +0800
[KYUUBI #7562] [INFRA] Remove gluten integration test module
This removes the kyuubi-gluten-it module, the gluten-it Maven profile, the CI workflow, and the GlutenSuiteMixin test utility.
Gluten IT is not maintained well, let's just remove it.
Pass GHA.
Assisted-by: GLM 5.2
Closes #7562 from pan3793/remove-gluten-it.
Closes #7562
45918d4c7 [Cheng Pan] [INFRA] Remove gluten integration test module
Authored-by: Cheng Pan <ch...@apache.org>
Signed-off-by: Cheng Pan <ch...@apache.org>
(cherry picked from commit 00ba4e65d2fe30ce09620a20ebef8ff2e99e6ac8)
Signed-off-by: Cheng Pan <ch...@apache.org>
---
.github/workflows/gluten.yml | 137 -------------------
docs/deployment/spark/gluten.md | 58 --------
docs/deployment/spark/index.rst | 1 -
integration-tests/kyuubi-gluten-it/pom.xml | 137 -------------------
.../src/test/resources/load-tpcds-tiny.sql | 146 ---------------------
.../src/test/resources/load-tpch-tiny.sql | 59 ---------
.../src/test/resources/log4j2-test.xml | 43 ------
.../org/apache/kyuubi/it/gluten/GlutenSuite.scala | 50 -------
.../org/apache/kyuubi/it/gluten/TPCUtils.scala | 32 -----
.../it/gluten/tpcds/GlutenTPCDSQuerySuite.scala | 86 ------------
.../it/gluten/tpch/GlutenTPCHQuerySuite.scala | 75 -----------
integration-tests/pom.xml | 6 -
.../scala/org/apache/kyuubi/GlutenSuiteMixin.scala | 34 -----
.../java/org/apache/kyuubi/tags/GlutenTest.java | 29 ----
14 files changed, 893 deletions(-)
diff --git a/.github/workflows/gluten.yml b/.github/workflows/gluten.yml
deleted file mode 100644
index 60b8439cc7..0000000000
--- a/.github/workflows/gluten.yml
+++ /dev/null
@@ -1,137 +0,0 @@
-#
-# 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.
-#
-
-name: Gluten CI
-
-on:
- schedule:
- - cron: 0 4 * * *
-
-env:
- MAVEN_ARGS: -Dmaven.javadoc.skip=true -Drat.skip=true -Dscalastyle.skip=true -Dspotless.check.skip -Dorg.slf4j.simpleLogger.defaultLogLevel=warn -Pjdbc-shaded,gen-policy -Dmaven.plugin.download.cache.path=/tmp/engine-archives
-
-jobs:
- gluten-build:
- name: Build Gluten
- if: ${{ startsWith(github.repository, 'apache/') }}
- runs-on: ubuntu-24.04
- steps:
- - uses: actions/checkout@v4
- - name: Free up disk space
- run: ./.github/scripts/free_disk_space.sh
- - name: Tune Runner VM
- uses: ./.github/actions/tune-runner-vm
- - name: Setup JDK 8
- uses: actions/setup-java@v4
- with:
- distribution: temurin
- java-version: 8
- cache: 'maven'
- - name: Setup Maven
- uses: ./.github/actions/setup-maven
- - name: Get gluten cache date
- id: date
- run: echo "date=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT
- - name: Check gluten cache
- id: gluten-cache
- uses: actions/cache@v4
- with:
- path: gluten/package/target/
- key: gluten_package_${{ steps.date.outputs.date }}
- - name: Get Ccache
- id: gluten-ccache-cache
- uses: actions/cache@v4
- with:
- path: gluten/.ccache
- key: ccache-centos7-release-default-${{github.sha}}
- restore-keys: |
- ccache-centos7-release-default
- - name: Build Gluten velox third party
- run: |
- if [[ "${{ steps.gluten-cache.outputs.cache-hit }}" != 'true' ]]; then
- git clone https://github.com/apache/gluten.git --depth=1
- cd gluten
- docker run -v $GITHUB_WORKSPACE/gluten:/work -w /work apache/gluten:vcpkg-centos-7 bash -c "
- df -a
- cd /work
- export CCACHE_DIR=/work/.ccache
- bash dev/ci-velox-buildstatic-centos-7.sh
- ccache -s
- mkdir -p /work/.m2/repository/org/apache/arrow/
- cp -r /root/.m2/repository/org/apache/arrow/* /work/.m2/repository/org/apache/arrow/
- "
- mkdir -p ~/.m2/repository/org/apache/arrow
- cp -r $GITHUB_WORKSPACE/gluten/.m2/repository/org/apache/arrow/* ~/.m2/repository/org/apache/arrow/
- mvn clean package -Pbackends-velox -Pceleborn -Puniffle -Pspark-3.5 -DskipTests
- fi
- - uses: actions/cache@v4
- if: steps.gluten-cache.outputs.cache-hit != 'true'
- with:
- path: gluten/package/target/
- key: gluten_package_${{ steps.date.outputs.date }}
- - name: Save Ccache
- uses: actions/cache@v4
- if: steps.gluten-ccache-cache.outputs.cache-hit != 'true'
- with:
- path: gluten/.ccache/
- key: ccache-centos7-release-default-${{github.sha}}
-
- gluten-it:
- name: Gluten Integration TPC-H/DS Test
- needs: gluten-build
- runs-on: ubuntu-24.04
- strategy:
- fail-fast: false
- matrix:
- spark: [ '3.5' ]
- steps:
- - uses: actions/checkout@v4
- - name: Free up disk space
- run: ./.github/scripts/free_disk_space.sh
- - name: Tune Runner VM
- uses: ./.github/actions/tune-runner-vm
- - name: Cache Engine Archives
- uses: ./.github/actions/cache-engine-archives
- - name: Get gluten cache date
- id: date
- run: echo "date=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT
- - name: Check gluten cache
- id: gluten-cache
- uses: actions/cache@v4
- with:
- path: gluten/package/target/
- key: gluten_package_${{ steps.date.outputs.date }}
- - name: Setup JDK 8
- uses: actions/setup-java@v4
- with:
- distribution: temurin
- java-version: 8
- cache: 'maven'
- - name: Setup Maven
- uses: ./.github/actions/setup-maven
- - name: Run Gluten Integration TPC-H/DS Test
- run: |
- TEST_MODULES="integration-tests/kyuubi-gluten-it"
- ./build/mvn -Pgluten-it -Pspark-${{ matrix.spark }} -pl ${TEST_MODULES} -am clean install -DskipTests
- ./build/mvn -Pgluten-it -Pspark-${{ matrix.spark }} -pl ${TEST_MODULES} test
- - name: Upload test logs
- if: failure()
- uses: actions/upload-artifact@v4
- with:
- name: unit-tests-log-spark-${{ matrix.spark }}-gluten
- path: |
- **/target/unit-tests.log
diff --git a/docs/deployment/spark/gluten.md b/docs/deployment/spark/gluten.md
deleted file mode 100644
index 8ae9c32664..0000000000
--- a/docs/deployment/spark/gluten.md
+++ /dev/null
@@ -1,58 +0,0 @@
-<!--
-- 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.
--->
-<!-- DO NOT MODIFY THIS FILE DIRECTLY, IT IS AUTO-GENERATED BY [org.apache.kyuubi.engine.spark.udf.KyuubiDefinedFunctionSuite] -->
-
-# Gluten
-
-[Apache Gluten](https://gluten.apache.org/) is a Spark plugin developed by Intel, designed to accelerate Apache Spark with native libraries.
-Currently, only CentOS 7/8 and Ubuntu 20.04/22.04, along with certain Spark versions, are supported.
-Users can employ the following methods to utilize the Gluten with Velox native libraries.
-
-## Building(with velox Backend)
-
-### Build gluten velox backend package
-
-Git clone gluten project, use gluten build script `buildbundle-veloxbe.sh`, and target package is in `/path/to/gluten/package/target/`
-
-```bash
-git clone https://github.com/apache/gluten.git
-cd gluten
-
-## The script builds jars for spark.
-./dev/buildbundle-veloxbe.sh
-```
-
-## Usage
-
-You can use Gluten to accelerate Spark by following steps.
-
-### Installing
-
-Add gluten jar: `copy /path/to/gluten/package/target/gluten-velox-bundle-spark3.x_2.12-*.jar $SPARK_HOME/jars/` or specified to `spark.jars` configuration
-
-### Configure
-
-Add the following minimal configuration into `spark-defaults.conf`:
-
-```properties
-spark.plugins=org.apache.gluten.GlutenPlugin
-spark.memory.offHeap.size=20g
-spark.memory.offHeap.enabled=true
-spark.shuffle.manager=org.apache.spark.shuffle.sort.ColumnarShuffleManager
-```
-
-More configuration can be found in the [documentation](https://apache.github.io/gluten/).
diff --git a/docs/deployment/spark/index.rst b/docs/deployment/spark/index.rst
index 237bdd7aac..1beb48d640 100644
--- a/docs/deployment/spark/index.rst
+++ b/docs/deployment/spark/index.rst
@@ -30,4 +30,3 @@ Even if you don't use Kyuubi, as a simple Spark user, I'm sure you'll find the n
dynamic_allocation
aqe
large_query_results
- gluten
diff --git a/integration-tests/kyuubi-gluten-it/pom.xml b/integration-tests/kyuubi-gluten-it/pom.xml
deleted file mode 100644
index 8deb858de3..0000000000
--- a/integration-tests/kyuubi-gluten-it/pom.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ 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.
- -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.kyuubi</groupId>
- <artifactId>integration-tests</artifactId>
- <version>1.11.2-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>kyuubi-gluten-it_${scala.binary.version}</artifactId>
- <name>Kyuubi Test Gluten IT</name>
- <url>https://kyuubi.apache.org/</url>
-
- <properties>
- <gluten.version>1.3.0-SNAPSHOT</gluten.version>
- <os.detected.release>ubuntu</os.detected.release>
- <os.detected.release.version>24.04</os.detected.release.version>
- <os.detected.arch>x86_64</os.detected.arch>
- <gluten.artifact.name>gluten-velox-bundle-spark${spark.binary.version}_${scala.binary.version}-${os.detected.release}_${os.detected.release.version}_${os.detected.arch}</gluten.artifact.name>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>io.glutenproject</groupId>
- <artifactId>${gluten.artifact.name}</artifactId>
- <version>${gluten.version}</version>
- <scope>system</scope>
- <systemPath>${project.basedir}/../../gluten/package/target/${gluten.artifact.name}-${gluten.version}.jar</systemPath>
- </dependency>
-
- <dependency>
- <groupId>org.apache.kyuubi</groupId>
- <artifactId>kyuubi-common_${scala.binary.version}</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.kyuubi</groupId>
- <artifactId>kyuubi-common_${scala.binary.version}</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.kyuubi</groupId>
- <artifactId>kyuubi-util-scala_${scala.binary.version}</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.kyuubi</groupId>
- <artifactId>kyuubi-spark-connector-common_${scala.binary.version}</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.kyuubi</groupId>
- <artifactId>kyuubi-spark-connector-tpcds_${scala.binary.version}</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.kyuubi</groupId>
- <artifactId>kyuubi-spark-connector-tpch_${scala.binary.version}</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.spark</groupId>
- <artifactId>spark-sql_${scala.binary.version}</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.spark</groupId>
- <artifactId>spark-hive_${scala.binary.version}</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>jakarta.servlet</groupId>
- <artifactId>jakarta.servlet-api</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory>
- <testOutputDirectory>target/scala-${scala.binary.version}/test-classes</testOutputDirectory>
- </build>
-
- <profiles>
- <profile>
- <id>gluten-it</id>
- <properties>
- <maven.plugin.scalatest.exclude.tags></maven.plugin.scalatest.exclude.tags>
- <maven.plugin.scalatest.include.tags>org.apache.kyuubi.tags.GlutenTest</maven.plugin.scalatest.include.tags>
- </properties>
- </profile>
- <profile>
- <id>spark-3.3</id>
- <properties>
- <!-- Gluten does not support the latest Spark 3.3 now -->
- <spark.version>3.3.1</spark.version>
- </properties>
- </profile>
- </profiles>
-</project>
diff --git a/integration-tests/kyuubi-gluten-it/src/test/resources/load-tpcds-tiny.sql b/integration-tests/kyuubi-gluten-it/src/test/resources/load-tpcds-tiny.sql
deleted file mode 100644
index 952a9cf3a3..0000000000
--- a/integration-tests/kyuubi-gluten-it/src/test/resources/load-tpcds-tiny.sql
+++ /dev/null
@@ -1,146 +0,0 @@
--- 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.
---
-
-CREATE DATABASE IF NOT EXISTS spark_catalog.tpcds_tiny;
-
-USE spark_catalog.tpcds_tiny;
-
---
--- Name: catalog_sales; Type: TABLE; Tablespace:
---
-CREATE TABLE IF NOT EXISTS catalog_sales USING parquet PARTITIONED BY (cs_sold_date_sk)
-AS SELECT * FROM tpcds.tiny.catalog_sales;
-
---
--- Name: catalog_returns; Type: TABLE; Tablespace:
---
-CREATE TABLE IF NOT EXISTS catalog_returns USING parquet PARTITIONED BY (cr_returned_date_sk)
-AS SELECT * FROM tpcds.tiny.catalog_returns;
-
---
--- Name: inventory; Type: TABLE; Tablespace:
---
-CREATE TABLE IF NOT EXISTS inventory USING parquet PARTITIONED BY (inv_date_sk)
-AS SELECT * FROM tpcds.tiny.inventory;
-
---
--- Name: store_sales; Type: TABLE; Tablespace:
---
-CREATE TABLE IF NOT EXISTS store_sales USING parquet PARTITIONED BY (ss_sold_date_sk)
-AS SELECT * FROM tpcds.tiny.store_sales;
-
---
--- Name: store_returns; Type: TABLE; Tablespace:
---
-CREATE TABLE IF NOT EXISTS store_returns USING parquet PARTITIONED BY (sr_returned_date_sk)
-AS SELECT * FROM tpcds.tiny.store_returns;
-
---
--- Name: web_sales; Type: TABLE; Tablespace:
---
-CREATE TABLE IF NOT EXISTS web_sales USING parquet PARTITIONED BY (ws_sold_date_sk)
-AS SELECT * FROM tpcds.tiny.web_sales;
-
---
--- Name: web_returns; Type: TABLE; Tablespace:
---
-CREATE TABLE IF NOT EXISTS web_returns USING parquet PARTITIONED BY (wr_returned_date_sk)
-AS SELECT * FROM tpcds.tiny.web_returns;
-
---
--- Name: call_center; Type: TABLE; Tablespace:
---
-CREATE TABLE IF NOT EXISTS call_center USING parquet AS SELECT * FROM tpcds.tiny.call_center;
-
---
--- Name: catalog_page; Type: TABLE; Tablespace:
---
-CREATE TABLE IF NOT EXISTS catalog_page USING parquet AS SELECT * FROM tpcds.tiny.catalog_page;
-
---
--- Name: customer; Type: TABLE; Tablespace:
---
-CREATE TABLE IF NOT EXISTS customer USING parquet AS SELECT * FROM tpcds.tiny.customer;
-
---
--- Name: customer_address; Type: TABLE; Tablespace:
---
-CREATE TABLE IF NOT EXISTS customer_address USING parquet AS SELECT * FROM tpcds.tiny.customer_address;
-
---
--- Name: customer_demographics; Type: TABLE; Tablespace:
---
-CREATE TABLE IF NOT EXISTS customer_demographics USING parquet AS SELECT * FROM tpcds.tiny.customer_demographics;
-
---
--- Name: date_dim; Type: TABLE; Tablespace:
---
-CREATE TABLE IF NOT EXISTS date_dim USING parquet AS SELECT * FROM tpcds.tiny.date_dim;
-
---
--- Name: household_demographics; Type: TABLE; Tablespace:
---
-CREATE TABLE IF NOT EXISTS household_demographics USING parquet AS SELECT * FROM tpcds.tiny.household_demographics;
-
---
--- Name: income_band; Type: TABLE; Tablespace:
---
-CREATE TABLE IF NOT EXISTS income_band USING parquet AS SELECT * FROM tpcds.tiny.income_band;
-
---
--- Name: item; Type: TABLE; Tablespace:
---
-CREATE TABLE IF NOT EXISTS item USING parquet AS SELECT * FROM tpcds.tiny.item;
-
---
--- Name: promotion; Type: TABLE; Tablespace:
---
-CREATE TABLE IF NOT EXISTS promotion USING parquet AS SELECT * FROM tpcds.tiny.promotion;
-
---
--- Name: reason; Type: TABLE; Tablespace:
---
-CREATE TABLE IF NOT EXISTS reason USING parquet AS SELECT * FROM tpcds.tiny.reason;
-
---
--- Name: ship_mode; Type: TABLE; Tablespace:
---
-CREATE TABLE IF NOT EXISTS ship_mode USING parquet AS SELECT * FROM tpcds.tiny.ship_mode;
-
---
--- Name: store; Type: TABLE; Tablespace:
---
-CREATE TABLE IF NOT EXISTS store USING parquet AS SELECT * FROM tpcds.tiny.store;
-
---
--- Name: time_dim; Type: TABLE; Tablespace:
---
-CREATE TABLE IF NOT EXISTS time_dim USING parquet AS SELECT * FROM tpcds.tiny.time_dim;
-
---
--- Name: warehouse; Type: TABLE; Tablespace:
---
-CREATE TABLE IF NOT EXISTS warehouse USING parquet AS SELECT * FROM tpcds.tiny.warehouse;
-
---
--- Name: web_page; Type: TABLE; Tablespace:
---
-CREATE TABLE IF NOT EXISTS web_page USING parquet AS SELECT * FROM tpcds.tiny.web_page;
-
---
--- Name: web_site; Type: TABLE; Tablespace:
---
-CREATE TABLE IF NOT EXISTS web_site USING parquet AS SELECT * FROM tpcds.tiny.web_site;
diff --git a/integration-tests/kyuubi-gluten-it/src/test/resources/load-tpch-tiny.sql b/integration-tests/kyuubi-gluten-it/src/test/resources/load-tpch-tiny.sql
deleted file mode 100644
index 8f2228f549..0000000000
--- a/integration-tests/kyuubi-gluten-it/src/test/resources/load-tpch-tiny.sql
+++ /dev/null
@@ -1,59 +0,0 @@
--- 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.
---
-
-CREATE DATABASE IF NOT EXISTS spark_catalog.tpch_tiny;
-
-USE spark_catalog.tpch_tiny;
-
---
--- Name: customer; Type: TABLE; Tablespace:
---
-CREATE TABLE IF NOT EXISTS customer USING parquet AS SELECT * FROM tpch.tiny.customer;
-
---
--- Name: orders; Type: TABLE; Tablespace:
---
-CREATE TABLE IF NOT EXISTS orders USING parquet AS SELECT * FROM tpch.tiny.orders;
-
---
--- Name: lineitem; Type: TABLE; Tablespace:
---
-CREATE TABLE IF NOT EXISTS lineitem USING parquet AS SELECT * FROM tpch.tiny.lineitem;
-
---
--- Name: part; Type: TABLE; Tablespace:
---
-CREATE TABLE IF NOT EXISTS part USING parquet AS SELECT * FROM tpch.tiny.part;
-
---
--- Name: partsupp; Type: TABLE; Tablespace:
---
-CREATE TABLE IF NOT EXISTS partsupp USING parquet AS SELECT * FROM tpch.tiny.partsupp;
-
---
--- Name: supplier; Type: TABLE; Tablespace:
---
-CREATE TABLE IF NOT EXISTS supplier USING parquet AS SELECT * FROM tpch.tiny.supplier;
-
---
--- Name: nation; Type: TABLE; Tablespace:
---
-CREATE TABLE IF NOT EXISTS nation USING parquet AS SELECT * FROM tpch.tiny.nation;
-
---
--- Name: region; Type: TABLE; Tablespace:
---
-CREATE TABLE IF NOT EXISTS region USING parquet AS SELECT * FROM tpch.tiny.region;
diff --git a/integration-tests/kyuubi-gluten-it/src/test/resources/log4j2-test.xml b/integration-tests/kyuubi-gluten-it/src/test/resources/log4j2-test.xml
deleted file mode 100644
index 3110216c17..0000000000
--- a/integration-tests/kyuubi-gluten-it/src/test/resources/log4j2-test.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ 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.
- -->
-
-<!-- Extra logging related to initialization of Log4j.
- Set to debug or trace if log4j initialization is failing. -->
-<Configuration status="WARN">
- <Appenders>
- <Console name="stdout" target="SYSTEM_OUT">
- <PatternLayout pattern="%d{HH:mm:ss.SSS} %p %c: %m%n%ex"/>
- <Filters>
- <ThresholdFilter level="FATAL"/>
- <RegexFilter regex=".*Thrift error occurred during processing of message.*" onMatch="DENY" onMismatch="NEUTRAL"/>
- </Filters>
- </Console>
- <File name="file" fileName="target/unit-tests.log">
- <PatternLayout pattern="%d{HH:mm:ss.SSS} %t %p %c{1}: %m%n%ex"/>
- <Filters>
- <RegexFilter regex=".*Thrift error occurred during processing of message.*" onMatch="DENY" onMismatch="NEUTRAL"/>
- </Filters>
- </File>
- </Appenders>
- <Loggers>
- <Root level="INFO">
- <AppenderRef ref="stdout"/>
- <AppenderRef ref="file"/>
- </Root>
- </Loggers>
-</Configuration>
diff --git a/integration-tests/kyuubi-gluten-it/src/test/scala/org/apache/kyuubi/it/gluten/GlutenSuite.scala b/integration-tests/kyuubi-gluten-it/src/test/scala/org/apache/kyuubi/it/gluten/GlutenSuite.scala
deleted file mode 100644
index b1ce30381a..0000000000
--- a/integration-tests/kyuubi-gluten-it/src/test/scala/org/apache/kyuubi/it/gluten/GlutenSuite.scala
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.kyuubi.it.gluten
-
-import org.apache.spark.SparkConf
-import org.apache.spark.sql.SparkSession
-
-import org.apache.kyuubi.{GlutenSuiteMixin, KyuubiFunSuite}
-import org.apache.kyuubi.spark.connector.common.LocalSparkSession.withSparkSession
-import org.apache.kyuubi.tags.GlutenTest
-
-@GlutenTest
-class GlutenSuite extends KyuubiFunSuite with GlutenSuiteMixin {
-
- lazy val sparkConf: SparkConf = {
- val glutenConf = new SparkConf().setMaster("local[*]")
- .set("spark.ui.enabled", "false")
- extraConfigs.foreach { case (k, v) => glutenConf.set(k, v) }
- glutenConf
- }
-
- test("KYUUBI #5467:test gluten select") {
- withSparkSession(SparkSession.builder.config(sparkConf).getOrCreate()) { spark =>
- val result = spark.sql("SELECT 1").head()
- assert(result.get(0) == 1)
- }
- }
-
- test("KYUUBI #5467: test gluten plan") {
- withSparkSession(SparkSession.builder.config(sparkConf).getOrCreate()) { spark =>
- val plan = spark.sql("explain SELECT 1").head().getString(0)
- assert(plan.contains("VeloxColumnarToRow") && plan.contains("RowToVeloxColumnar"))
- }
- }
-}
diff --git a/integration-tests/kyuubi-gluten-it/src/test/scala/org/apache/kyuubi/it/gluten/TPCUtils.scala b/integration-tests/kyuubi-gluten-it/src/test/scala/org/apache/kyuubi/it/gluten/TPCUtils.scala
deleted file mode 100644
index 667a237809..0000000000
--- a/integration-tests/kyuubi-gluten-it/src/test/scala/org/apache/kyuubi/it/gluten/TPCUtils.scala
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.kyuubi.it.gluten
-
-import scala.io.{Codec, Source}
-
-import org.apache.kyuubi.Utils
-
-object TPCUtils {
- def loadTPCFile(resourceFile: String): String = {
- val in = Utils.getContextOrKyuubiClassLoader
- .getResourceAsStream(resourceFile)
- val str: String = Source.fromInputStream(in)(Codec.UTF8).mkString
- in.close()
- str
- }
-}
diff --git a/integration-tests/kyuubi-gluten-it/src/test/scala/org/apache/kyuubi/it/gluten/tpcds/GlutenTPCDSQuerySuite.scala b/integration-tests/kyuubi-gluten-it/src/test/scala/org/apache/kyuubi/it/gluten/tpcds/GlutenTPCDSQuerySuite.scala
deleted file mode 100644
index 9110974a32..0000000000
--- a/integration-tests/kyuubi-gluten-it/src/test/scala/org/apache/kyuubi/it/gluten/tpcds/GlutenTPCDSQuerySuite.scala
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.kyuubi.it.gluten.tpcds
-
-import scala.collection.JavaConverters._
-
-import org.apache.spark.SparkConf
-import org.apache.spark.sql.SparkSession
-import org.scalatest.tags.Slow
-
-import org.apache.kyuubi.{GlutenSuiteMixin, KyuubiFunSuite}
-import org.apache.kyuubi.it.gluten.TPCUtils.loadTPCFile
-import org.apache.kyuubi.spark.connector.common.GoldenFileUtils.LICENSE_HEADER
-import org.apache.kyuubi.spark.connector.common.LocalSparkSession.withSparkSession
-import org.apache.kyuubi.spark.connector.tpcds.TPCDSCatalog
-import org.apache.kyuubi.tags.GlutenTest
-
-@Slow
-@GlutenTest
-class GlutenTPCDSQuerySuite extends KyuubiFunSuite with GlutenSuiteMixin {
-
- val queries: Set[String] = (1 to 99).map(i => s"q$i").toSet -
- ("q14", "q23", "q24", "q39") +
- ("q14a", "q14b", "q23a", "q23b", "q24a", "q24b", "q39a", "q39b") -
- // TODO:Fix gluten tpc-ds query test
- ("q1", "q4", "q7", "q11", "q12", "q17", "q20", "q21", "q25", "q26", "q29", "q30", "q34", "q37",
- "q39a", "q39b", "q40", "q43", "q46", "q49", "q56", "q58", "q59", "q60", "q68", "q73", "q74",
- "q78", "q79", "q81", "q82", "q83", "q84", "q91", "q98")
- lazy val sparkConf: SparkConf = {
- val glutenConf = new SparkConf().setMaster("local[*]")
- .set("spark.ui.enabled", "false")
- .set("spark.sql.catalogImplementation", "in-memory")
- .set("spark.sql.catalog.tpcds", classOf[TPCDSCatalog].getName)
- .set("spark.sql.catalog.tpcds.useTableSchema_2_6", "true")
- extraConfigs.foreach { case (k, v) => glutenConf.set(k, v) }
- glutenConf
- }
-
- test("KYUUBI #5467:gluten tpc-ds tiny query suite") {
- val viewSuffix = "view"
- withSparkSession(SparkSession.builder.config(sparkConf).getOrCreate()) { spark =>
- loadTPDSTINY(spark)
- queries.map { queryName =>
- queryName -> loadTPCFile(s"kyuubi/tpcds_3.2/$queryName.sql")
- }.foreach { case (name, sql) =>
- try {
- val result = spark.sql(sql).collect()
- val schema = spark.sql(sql).schema
- val schemaDDL = LICENSE_HEADER + schema.toDDL + "\n"
- spark.createDataFrame(result.toList.asJava, schema).createTempView(s"$name$viewSuffix")
- val sumHashResult = LICENSE_HEADER + spark.sql(
- s"select sum(hash(*)) from $name$viewSuffix").collect().head.get(0) + "\n"
- val expectHash = loadTPCFile(s"kyuubi/tpcds_3.2/$name.output.hash")
- val expectSchema = loadTPCFile(s"kyuubi/tpcds_3.2/$name.output.schema")
- assert(schemaDDL == expectSchema)
- assert(sumHashResult == expectHash)
- } catch {
- case cause: Throwable =>
- fail(name, cause)
- }
- }
- }
- }
-
- def loadTPDSTINY(sc: SparkSession): Unit = {
- val queryContent: String = loadTPCFile("load-tpcds-tiny.sql")
- queryContent.split(";\n").filterNot(_.trim.isEmpty).foreach { sql =>
- sc.sql(sql)
- }
- }
-}
diff --git a/integration-tests/kyuubi-gluten-it/src/test/scala/org/apache/kyuubi/it/gluten/tpch/GlutenTPCHQuerySuite.scala b/integration-tests/kyuubi-gluten-it/src/test/scala/org/apache/kyuubi/it/gluten/tpch/GlutenTPCHQuerySuite.scala
deleted file mode 100644
index 019ecc165e..0000000000
--- a/integration-tests/kyuubi-gluten-it/src/test/scala/org/apache/kyuubi/it/gluten/tpch/GlutenTPCHQuerySuite.scala
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.kyuubi.it.gluten.tpch
-
-import scala.collection.JavaConverters._
-
-import org.apache.spark.SparkConf
-import org.apache.spark.sql.SparkSession
-import org.scalatest.tags.Slow
-
-import org.apache.kyuubi.{GlutenSuiteMixin, KyuubiFunSuite}
-import org.apache.kyuubi.it.gluten.TPCUtils.loadTPCFile
-import org.apache.kyuubi.spark.connector.common.GoldenFileUtils.LICENSE_HEADER
-import org.apache.kyuubi.spark.connector.common.LocalSparkSession.withSparkSession
-import org.apache.kyuubi.spark.connector.tpch.TPCHCatalog
-import org.apache.kyuubi.tags.GlutenTest
-
-@Slow
-@GlutenTest
-class GlutenTPCHQuerySuite extends KyuubiFunSuite with GlutenSuiteMixin {
- // TODO: Fix the inconsistency in q3/q9 results.
- val queries: Set[String] = (1 to 22).map(i => s"q$i").toSet -- Seq("q3", "q9")
-
- lazy val sparkConf: SparkConf = {
- val glutenConf = new SparkConf().setMaster("local[*]")
- .set("spark.ui.enabled", "false")
- .set("spark.sql.catalogImplementation", "in-memory")
- .set("spark.sql.catalog.tpch", classOf[TPCHCatalog].getName)
- extraConfigs.foreach { case (k, v) => glutenConf.set(k, v) }
- glutenConf
- }
-
- test("KYUUBI #5467:gluten tpc-h tiny query suite") {
- val viewSuffix = "view"
- withSparkSession(SparkSession.builder.config(sparkConf).getOrCreate()) { spark =>
- loadTPCHTINY(spark)
- queries.map { queryName =>
- queryName -> loadTPCFile(s"kyuubi/tpch/$queryName.sql")
- }.foreach { case (name, sql) =>
- val result = spark.sql(sql).collect()
- val schema = spark.sql(sql).schema
- val schemaDDL = LICENSE_HEADER + schema.toDDL + "\n"
- spark.createDataFrame(result.toList.asJava, schema).createTempView(s"$name$viewSuffix")
- val sumHashResult = LICENSE_HEADER + spark.sql(
- s"select sum(hash(*)) from $name$viewSuffix").collect().head.get(0) + "\n"
- val expectHash = loadTPCFile(s"kyuubi/tpch/$name.output.hash")
- val expectSchema = loadTPCFile(s"kyuubi/tpch/$name.output.schema")
- assert(schemaDDL == expectSchema, s"query $name schema not match")
- assert(sumHashResult == expectHash, s"query $name result not match")
- }
- }
- }
-
- def loadTPCHTINY(sc: SparkSession): Unit = {
- val queryContent: String = loadTPCFile("load-tpch-tiny.sql")
- queryContent.split(";\n").filterNot(_.trim.isEmpty).foreach { sql =>
- sc.sql(sql)
- }
- }
-}
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 7f5c8335ab..6b2a2203f2 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -44,11 +44,5 @@
<module>kyuubi-kubernetes-it</module>
</modules>
</profile>
- <profile>
- <id>gluten-it</id>
- <modules>
- <module>kyuubi-gluten-it</module>
- </modules>
- </profile>
</profiles>
</project>
diff --git a/kyuubi-common/src/test/scala/org/apache/kyuubi/GlutenSuiteMixin.scala b/kyuubi-common/src/test/scala/org/apache/kyuubi/GlutenSuiteMixin.scala
deleted file mode 100644
index 63fcf3bec2..0000000000
--- a/kyuubi-common/src/test/scala/org/apache/kyuubi/GlutenSuiteMixin.scala
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.kyuubi
-
-trait GlutenSuiteMixin {
- protected def extraJars: String = {
- System.getProperty("java.class.path")
- .split(":")
- .filter(_.contains("gluten-velox-bundle-spark")).head
- }
-
- protected def extraConfigs: Map[String, String] = Map(
- "spark.plugins" -> "org.apache.gluten.GlutenPlugin",
- "spark.memory.offHeap.size" -> "4g",
- "spark.memory.offHeap.enabled" -> "true",
- "spark.shuffle.manager" -> "org.apache.spark.shuffle.sort.ColumnarShuffleManager",
- "spark.gluten.ui.enabled" -> "false",
- "spark.jars" -> extraJars)
-}
diff --git a/kyuubi-util-scala/src/test/java/org/apache/kyuubi/tags/GlutenTest.java b/kyuubi-util-scala/src/test/java/org/apache/kyuubi/tags/GlutenTest.java
deleted file mode 100644
index 8620df4b95..0000000000
--- a/kyuubi-util-scala/src/test/java/org/apache/kyuubi/tags/GlutenTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.kyuubi.tags;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import org.scalatest.TagAnnotation;
-
-@TagAnnotation
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.METHOD, ElementType.TYPE})
-public @interface GlutenTest {}