This is an automated email from the ASF dual-hosted git repository.
yuqi4733 pushed a commit to branch branch-trino-smv
in repository https://gitbox.apache.org/repos/asf/gravitino.git
The following commit(s) were added to refs/heads/branch-trino-smv by this push:
new 4439b9c080 [#9952] feat (trino-connector): Add the version segment
module to support Trino 446-451 (#9953)
4439b9c080 is described below
commit 4439b9c0804667f489bbcfa8b8848efa660b7a9c
Author: Yuhui <[email protected]>
AuthorDate: Wed Feb 25 21:33:54 2026 +0800
[#9952] feat (trino-connector): Add the version segment module to support
Trino 446-451 (#9953)
### What changes were proposed in this pull request?
Add the version segment module for 446-451 to support Trino 446 through
Trino 451
### Why are the changes needed?
Fix: #9952
### Does this PR introduce _any_ user-facing change?
NO
### How was this patch tested?
UT and IT
---------
Co-authored-by: Claude Sonnet 4.5 <[email protected]>
Co-authored-by: Qi Yu <[email protected]>
---
.claude/skills/trino-test/SKILL.md | 113 ++++
.claude/skills/trino-test/trino-test-guide.md | 576 +++++++++++++++++++++
.../workflows/backend-integration-test-action.yml | 2 +
.github/workflows/build.yml | 13 +-
build.gradle.kts | 1 +
.../integration/test/CatalogOceanBaseIT.java | 2 +
.../operation/TestOceanBaseDatabaseOperations.java | 2 +
.../operation/TestOceanBaseTableOperations.java | 2 +
gradle/libs.versions.toml | 2 +-
.../docker-script/docker-compose.yaml | 8 +-
.../integration/test/container/ContainerSuite.java | 31 +-
.../test/container/TrinoITContainers.java | 12 +-
.../gravitino/integration/test/util/ITUtils.java | 39 ++
settings.gradle.kts | 1 +
trino-connector/integration-test/build.gradle.kts | 5 +-
.../connector/integration/test/TrinoQueryIT.java | 2 +
.../testsets/jdbc-mysql/00004_query_pushdown.txt | 13 +-
.../jdbc-postgresql/00004_query_pushdown.txt | 15 +-
.../trino-ci-testset/testsets/trino-435-445.patch | 97 ++++
.../trino-test-tools/run_test_with_versions.sh | 4 +-
.../trino-connector-440-445/build.gradle.kts | 3 +-
.../build.gradle.kts | 9 +-
.../trino/connector/GravitinoConnector446.java | 55 ++
.../connector/GravitinoConnectorFactory446.java | 57 ++
.../trino/connector/GravitinoMetadata446.java | 90 ++++
.../GravitinoNodePartitioningProvider446.java | 30 ++
.../trino/connector/GravitinoPlugin446.java | 38 ++
.../trino/connector/GravitinoSplitManager446.java | 61 +++
.../connector/GravitinoSystemConnector446.java | 82 +++
.../META-INF/services/io.trino.spi.Plugin | 19 +
.../src/test/java/TestGravitinoConnector446.java | 61 +++
.../trino/connector/GravitinoMetadata.java | 2 +
32 files changed, 1406 insertions(+), 41 deletions(-)
diff --git a/.claude/skills/trino-test/SKILL.md
b/.claude/skills/trino-test/SKILL.md
new file mode 100644
index 0000000000..b549ee0e17
--- /dev/null
+++ b/.claude/skills/trino-test/SKILL.md
@@ -0,0 +1,113 @@
+<!--
+ 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: trino-test
+description: Run, debug, and manage Trino integration tests for the Gravitino
project.
+argument-hint: "[command or intent] (e.g. run all | test mysql | trino 446 |
add test)"
+allowed-tools: Bash
+disable-model-invocation: false
+---
+
+# /trino-test — Trino Integration Test Skill
+
+This skill helps you **run, debug, and manage Trino integration tests** for
the **Gravitino** project.
+
+Use this skill whenever the user asks about:
+- running Trino integration tests
+- testing specific connectors (e.g. MySQL)
+- testing specific Trino versions
+- adding or fixing Trino test cases
+
+---
+
+## Documentation Reference
+
+Full guide:
+
+.claude/skills/trino-test-guide.md
+
+Read the guide for complete details on:
+- Test architecture and structure
+- All available parameters and options
+- Test modes (`--auto=all | gravitino | none`)
+- Adding and modifying tests
+- Expected output format (`.txt` with `%` wildcards)
+- Debugging and troubleshooting
+
+---
+
+## Project Root
+
+All commands assume:
+
+```bash
+cd /home/ubuntu/git/gravitino
+```
+
+---
+
+## Quick Commands
+
+### Run all tests
+```bash
+./trino-connector/integration-test/trino-test-tools/trino_integration_test.sh \
+ --auto=all
+```
+
+### Run specific test set
+```bash
+./trino-connector/integration-test/trino-test-tools/trino_integration_test.sh \
+ --auto=all --test_set=jdbc-mysql
+```
+
+### Run specific test file
+```bash
+./trino-connector/integration-test/trino-test-tools/trino_integration_test.sh \
+ --auto=all --test_set=jdbc-mysql --tester_id=00004
+```
+
+### Test with Trino 446
+```bash
+./trino-connector/integration-test/trino-test-tools/trino_integration_test.sh \
+ --auto=all \
+ --trino_version=446 \
+
--trino_connector_dir=/home/ubuntu/git/gravitino/trino-connector/trino-connector-446-451/build/libs
+```
+
+### Multi-version test
+```bash
+./trino-connector/integration-test/trino-test-tools/run_test_with_versions.sh \
+ --trino_versions_map="446:trino-connector-446-451"
+```
+
+---
+
+## Test Structure
+
+Location:
+
+```
+trino-connector/integration-test/src/test/resources/trino-ci-testset/testsets/
+```
+
+Each test consists of:
+- `*.sql` — SQL statements to execute
+- `*.txt` — Expected output
+ - Supports `%` wildcard for flexible matching
diff --git a/.claude/skills/trino-test/trino-test-guide.md
b/.claude/skills/trino-test/trino-test-guide.md
new file mode 100644
index 0000000000..f69d4cdb12
--- /dev/null
+++ b/.claude/skills/trino-test/trino-test-guide.md
@@ -0,0 +1,576 @@
+<!--
+ 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.
+-->
+
+# Trino Integration Test Guide
+
+## Overview
+
+Gravitino's Trino integration tests are executed through the
**TrinoQueryTestTool** class, which reads SQL files from testsets, executes SQL
statements, and verifies output results. The tests support multiple modes and
flexible configuration options.
+
+## Part 1: How to Run Tests
+
+### Test Architecture
+
+```
+trino-connector/integration-test/
+├── src/test/
+│ ├── java/
+│ │ └── .../TrinoQueryTestTool.java # Core test tool class
+│ └── resources/
+│ └── trino-ci-testset/testsets/ # Test sets directory
+│ ├── jdbc-mysql/ # MySQL test set
+│ │ ├── 00001_select_table.sql # SQL test file
+│ │ └── 00001_select_table.txt # Expected output file
+│ ├── jdbc-postgresql/ # PostgreSQL test set
+│ ├── lakehouse-iceberg/ # Iceberg test set
+│ ├── hive/ # Hive test set
+│ ├── tpch/ # TPC-H test set
+│ └── tpcds/ # TPC-DS test set
+└── trino-test-tools/ # Test scripts
+ ├── trino_integration_test.sh # Main test script
+ └── run_test_with_versions.sh # Multi-version test script
+```
+
+### 1.1 Running Tests with Scripts (Recommended)
+
+#### Basic Usage
+
+```bash
+# Run all tests (auto-start all services)
+./trino-connector/integration-test/trino-test-tools/trino_integration_test.sh
--auto=all
+
+# Run all tests and ignore failures
+./trino-connector/integration-test/trino-test-tools/trino_integration_test.sh \
+ --auto=all --ignore_failed
+```
+
+#### Specify Test Set
+
+```bash
+# Run specific test set (e.g., jdbc-mysql)
+./trino-connector/integration-test/trino-test-tools/trino_integration_test.sh \
+ --auto=all --test_set=jdbc-mysql
+
+# Run specific test set under specific catalog
+./trino-connector/integration-test/trino-test-tools/trino_integration_test.sh \
+ --auto=all --test_set=tpch --catalog=mysql
+```
+
+#### Specify Test File
+
+```bash
+# Run specific test file (by tester_id prefix)
+./trino-connector/integration-test/trino-test-tools/trino_integration_test.sh \
+ --auto=all --test_set=jdbc-mysql --tester_id=00004
+
+# This will run jdbc-mysql/00004_query_pushdown.sql
+```
+
+#### Specify Trino Version
+
+```bash
+# Test with Trino 446
+./trino-connector/integration-test/trino-test-tools/trino_integration_test.sh \
+ --auto=all --trino_version=446 \
+ --trino_connector_dir=/path/to/trino-connector-446-451/build/libs
+
+# Test with Trino 435
+./trino-connector/integration-test/trino-test-tools/trino_integration_test.sh \
+ --auto=all --trino_version=435 \
+ --trino_connector_dir=/path/to/trino-connector-435-439/build/libs
+```
+
+### 1.2 Test Modes
+
+#### Auto Mode (--auto)
+
+**all (default)**: Auto-start all services
+```bash
+./trino-connector/integration-test/trino-test-tools/trino_integration_test.sh
--auto=all
+```
+- Auto-start Gravitino server
+- Auto-start Docker containers (Trino, Hive, MySQL, PostgreSQL, etc.)
+- Suitable for local development and CI environments
+
+**gravitino**: Start only Gravitino server
+```bash
+./trino-connector/integration-test/trino-test-tools/trino_integration_test.sh
--auto=gravitino
+```
+- Auto-start Gravitino server
+- Requires manual start of other services
+- Suitable for debugging Gravitino server
+
+**none**: Don't auto-start any services
+```bash
+./trino-connector/integration-test/trino-test-tools/trino_integration_test.sh \
+ --auto=none \
+ --gravitino_uri=http://10.3.21.12:8090 \
+ --trino_uri=http://10.3.21.12:8080 \
+ --mysql_uri=jdbc:mysql://10.3.21.12:3306
+```
+- Connect to running services
+- Suitable for connecting to remote test environments
+
+### 1.3 Advanced Options
+
+#### Distributed Cluster Testing
+
+```bash
+# Use 3 independent Trino worker nodes
+./trino-connector/integration-test/trino-test-tools/trino_integration_test.sh \
+ --auto=all --trino_worker_num=3
+```
+
+#### Generate Expected Output Files
+
+```bash
+# Generate expected output files for tests (for creating new tests)
+./trino-connector/integration-test/trino-test-tools/trino_integration_test.sh \
+ --auto=all --test_set=jdbc-mysql --gen_output
+```
+
+#### Parameter Substitution
+
+```bash
+# Replace ${key} variables in test files
+./trino-connector/integration-test/trino-test-tools/trino_integration_test.sh \
+ --auto=all --params=key1,value1;key2,value2
+```
+
+### 1.4 TrinoQueryTestTool Complete Parameter List
+
+| Parameter | Description | Default | Example |
+|-----------|-------------|---------|---------|
+| `--auto` | Auto-start mode: all/gravitino/none | all | `--auto=all` |
+| `--ignore_failed` | Ignore failed tests and continue | false |
`--ignore_failed` |
+| `--gen_output` | Generate expected output files | false | `--gen_output` |
+| `--test_host` | Host address for all services | 127.0.0.1 |
`--test_host=10.3.21.12` |
+| `--gravitino_uri` | Gravitino server URL | - |
`--gravitino_uri=http://localhost:8090` |
+| `--trino_uri` | Trino URL | - | `--trino_uri=http://localhost:8080` |
+| `--hive_uri` | Hive metastore URL | - | `--hive_uri=thrift://localhost:9083`
|
+| `--mysql_uri` | MySQL JDBC URL | - |
`--mysql_uri=jdbc:mysql://localhost:3306` |
+| `--postgresql_uri` | PostgreSQL JDBC URL | - |
`--postgresql_uri=jdbc:postgresql://localhost:5432` |
+| `--hdfs_uri` | HDFS URL | - | `--hdfs_uri=hdfs://localhost:9000` |
+| `--test_sets_dir` | Test sets directory |
src/test/resources/trino-ci-testset/testsets |
`--test_sets_dir=/path/to/testsets` |
+| `--test_set` | Specify test set name | - | `--test_set=jdbc-mysql` |
+| `--tester_id` | Specify test file prefix | - | `--tester_id=00004` |
+| `--catalog` | Specify catalog name | - | `--catalog=mysql` |
+| `--params` | Parameter substitution | - | `--params=key1,v1;key2,v2` |
+| `--trino_worker_num` | Number of Trino workers | 0 | `--trino_worker_num=3` |
+| `--trino_version` | Trino version | 435 | `--trino_version=446` |
+| `--trino_connector_dir` | Connector JAR directory |
trino-connector/build/libs | `--trino_connector_dir=/path/to/libs` |
+| `--help` | Show help message | - | `--help` |
+
+### 1.5 Common Test Scenarios
+
+#### Scenario 1: Quick validation of all tests
+
+```bash
+./trino-connector/integration-test/trino-test-tools/trino_integration_test.sh
--auto=all
+```
+
+#### Scenario 2: Test only MySQL functionality
+
+```bash
+./trino-connector/integration-test/trino-test-tools/trino_integration_test.sh \
+ --auto=all --test_set=jdbc-mysql
+```
+
+#### Scenario 3: Debug specific test file
+
+```bash
+./trino-connector/integration-test/trino-test-tools/trino_integration_test.sh \
+ --auto=all --test_set=jdbc-mysql --tester_id=00004
+```
+
+#### Scenario 4: Verify Trino 446 compatibility
+
+```bash
+./trino-connector/integration-test/trino-test-tools/run_test_with_versions.sh \
+ --trino_versions_map="446:trino-connector-446-451"
+```
+
+#### Scenario 5: Connect to remote test environment
+
+```bash
+./trino-connector/integration-test/trino-test-tools/trino_integration_test.sh \
+ --auto=none \
+ --gravitino_uri=http://remote-server:8090 \
+ --trino_uri=http://remote-server:8080 \
+ --mysql_uri=jdbc:mysql://remote-server:3306 \
+ --test_set=jdbc-mysql
+```
+
+## Part 2: How to Add/Modify Tests
+
+### 2.1 Test File Structure
+
+Each test consists of two files:
+
+1. **SQL file** (`.sql`): Contains SQL statements to execute
+2. **Expected output file** (`.txt`): Contains expected output for each SQL
statement
+
+### 2.2 Adding New Tests
+
+#### Step 1: Create SQL Test File
+
+Create SQL file in the appropriate test set directory with format:
`{number}_{test_name}.sql`
+
+```bash
+# Example: Create new query test
+vi
trino-connector/integration-test/src/test/resources/trino-ci-testset/testsets/jdbc-mysql/00010_new_query.sql
+```
+
+SQL file content example:
+```sql
+-- Create schema
+CREATE SCHEMA gt_mysql.test_db;
+
+-- Use schema
+USE gt_mysql.test_db;
+
+-- Create table
+CREATE TABLE users (
+ id bigint NOT NULL,
+ name varchar(50) NOT NULL,
+ email varchar(100) NOT NULL
+);
+
+-- Insert data
+INSERT INTO users VALUES (1, 'Alice', '[email protected]');
+INSERT INTO users VALUES (2, 'Bob', '[email protected]');
+
+-- Query data
+SELECT * FROM users ORDER BY id;
+
+-- Cleanup
+DROP TABLE users;
+DROP SCHEMA test_db;
+```
+
+#### Step 2: Generate Expected Output File
+
+Use `--gen_output` option to auto-generate expected output:
+
+```bash
+./trino-connector/integration-test/trino-test-tools/trino_integration_test.sh \
+ --auto=all \
+ --test_set=jdbc-mysql \
+ --tester_id=00010 \
+ --gen_output
+```
+
+This will generate `00010_new_query.txt` file containing actual execution
output.
+
+#### Step 3: Verify and Adjust Expected Output
+
+Check the generated `.txt` file:
+```bash
+cat
trino-connector/integration-test/src/test/resources/trino-ci-testset/testsets/jdbc-mysql/00010_new_query.txt
+```
+
+Adjust expected output as needed, using wildcard `%` to match variable content.
+
+### 2.3 Modifying Existing Tests
+
+#### Modify SQL File
+
+Directly edit the `.sql` file:
+```bash
+vi
trino-connector/integration-test/src/test/resources/trino-ci-testset/testsets/jdbc-mysql/00004_query_pushdown.sql
+```
+
+#### Update Expected Output
+
+Method 1: Regenerate
+```bash
+./trino-connector/integration-test/trino-test-tools/trino_integration_test.sh \
+ --auto=all \
+ --test_set=jdbc-mysql \
+ --tester_id=00004 \
+ --gen_output
+```
+
+Method 2: Manual edit
+```bash
+vi
trino-connector/integration-test/src/test/resources/trino-ci-testset/testsets/jdbc-mysql/00004_query_pushdown.txt
+```
+
+### 2.4 Expected Output File Format
+
+#### Basic Format
+
+Expected output file contains expected output for each SQL statement,
separated by blank lines:
+
+```
+CREATE SCHEMA
+
+USE
+
+CREATE TABLE
+
+INSERT: 2 rows
+
+"1","Alice","[email protected]"
+"2","Bob","[email protected]"
+
+DROP TABLE
+
+DROP SCHEMA
+```
+
+#### Using Wildcards
+
+Use `%` to match variable content:
+
+**Example 1: Match version number**
+```
+"Trino version: %
+```
+Matches: `Trino version: 446`, `Trino version: 435`, etc.
+
+**Example 2: Match query plan**
+```
+%TableScan[table = gt_mysql:gt_db1.customer%]
+```
+Matches any TableScan node containing this table
+
+**Example 3: Match LIKE operation**
+```
+%ScanFilter[table = gt_mysql:gt_db1.customer%like%phone%]
+```
+Ensures output contains `like` and `phone`, verifying query pushdown
functionality
+
+#### Quote Rules
+
+For multi-line output (like EXPLAIN results), wrap with double quotes:
+
+```
+"Trino version: %
+%
+ %TableScan[table = gt_mysql:gt_db1.customer%]
+ Layout: [custkey:bigint, name:varchar(25)]
+%
+"
+```
+
+### 2.5 Testing Best Practices
+
+#### 1. Test Independence
+
+Each test should be independent, not depending on other tests:
+```sql
+-- Good practice: Create and cleanup own resources
+CREATE SCHEMA test_db;
+USE test_db;
+CREATE TABLE test_table (...);
+-- Execute test
+DROP TABLE test_table;
+DROP SCHEMA test_db;
+```
+
+#### 2. Use Meaningful Test Names
+
+```
+00001_select_table.sql # Basic query test
+00004_query_pushdown.sql # Query pushdown test
+00008_update_table.sql # UPDATE operation test
+```
+
+#### 3. Expected Output Flexibility
+
+Use wildcards to match variable content, but retain key information for
verification:
+
+```
+# Too strict (will fail due to version changes)
+└─ ScanFilter[table = gt_mysql:gt_db1.customer, filterPredicate =
"$like"("phone", ...)]
+
+# Too loose (cannot verify functionality)
+%
+
+# Appropriate (verifies key functionality, allows format changes)
+%ScanFilter[table = gt_mysql:gt_db1.customer%like%phone%]
+```
+
+#### 4. Test Data Volume
+
+Use appropriate amount of test data:
+```sql
+-- Good practice: Small but sufficient data
+INSERT INTO customer VALUES (1, 'Alice', ...);
+INSERT INTO customer VALUES (2, 'Bob', ...);
+
+-- Avoid: Too much test data
+INSERT INTO customer SELECT * FROM large_table; -- May cause slow tests
+```
+
+### 2.6 Debugging Tests
+
+#### View Test Execution Logs
+
+Test logs output to console with detailed execution information:
+```
+2026-02-06 21:17:25 INFO [pool-7-thread-1] TrinoQueryIT:245 -
+Execute sql in the tester jdbc-mysql/00004_query_pushdown.sql under catalog
mysql successfully.
+```
+
+#### Compare Actual vs Expected Output
+
+When test fails, logs show:
+```
+Failed to execute test java.lang.RuntimeException:
+Execute sql in the tester jdbc-mysql/00004_query_pushdown.sql under catalog
mysql failed.
+Sql:
+explain select * from customer where phone like '%2342%' limit 10;
+Expect:
+"Trino version: %
+%
+ %ScanFilter[...]
+"
+Actual:
+"Trino version: 446
+Fragment 0 [SINGLE]
+ ...
+"
+```
+
+#### Run Failed Test Separately
+
+```bash
+./trino-connector/integration-test/trino-test-tools/trino_integration_test.sh \
+ --auto=all \
+ --test_set=jdbc-mysql \
+ --tester_id=00004
+```
+
+#### Use ignore_failed to Continue Testing
+
+```bash
+./trino-connector/integration-test/trino-test-tools/trino_integration_test.sh \
+ --auto=all \
+ --ignore_failed
+```
+
+#### Check Log Files
+
+When tests fail or you need to debug issues, check the following log locations:
+
+**Test Execution Logs:**
+```bash
+# Integration test logs (test execution output)
+cat integration-test-common/build/integration-test-common-integration-test.log
+```
+
+**Container Logs:**
+```bash
+# Trino container logs
+cat integration-test-common/build/trino-ci-container-log/trino.log
+
+# Hive container logs (directory containing multiple log files)
+ls integration-test-common/build/trino-ci-container-log/hive/
+cat integration-test-common/build/trino-ci-container-log/hive/<log-file>
+
+# HDFS container logs (directory containing multiple log files)
+ls integration-test-common/build/trino-ci-container-log/hdfs/
+cat integration-test-common/build/trino-ci-container-log/hdfs/<log-file>
+```
+
+These logs contain detailed information about:
+- Test execution results and failures
+- SQL query execution details
+- Container startup and runtime issues
+- Service connection errors
+- Docker container output
+
+### 2.7 Test Set Organization
+
+#### Organize by Functionality
+
+```
+testsets/
+├── jdbc-mysql/ # MySQL JDBC functionality tests
+├── jdbc-postgresql/ # PostgreSQL JDBC functionality tests
+├── lakehouse-iceberg/ # Iceberg lakehouse functionality tests
+├── hive/ # Hive functionality tests
+├── tpch/ # TPC-H benchmark tests
+└── tpcds/ # TPC-DS benchmark tests
+```
+
+#### Test File Naming Convention
+
+Use 5-digit number prefix for easy sorting and reference:
+```
+00001_basic_query.sql
+00002_join_query.sql
+00003_aggregate_query.sql
+00004_query_pushdown.sql
+...
+00010_new_feature.sql
+```
+
+### 2.8 Common Issues
+
+#### Issue 1: Test output mismatch
+
+**Cause**: Trino version changes causing output format changes
+
+**Solution**: Use wildcard patterns to make expected output more flexible
+```
+# Before
+└─ TableScan[table = gt_mysql:gt_db1.customer, limit=10]
+
+# After
+%TableScan[table = gt_mysql:gt_db1.customer%limit%10%]
+```
+
+#### Issue 2: Test timeout
+
+**Cause**: Too much test data or complex queries
+
+**Solution**:
+- Reduce test data volume
+- Simplify queries
+- Increase timeout settings
+
+#### Issue 3: Docker container startup failure
+
+**Cause**: Port conflicts or insufficient resources
+
+**Solution**:
+```bash
+# Cleanup old containers
+./integration-test-common/docker-script/shutdown.sh
+
+# Check port usage
+lsof -i :8080
+lsof -i :9083
+```
+
+## Summary
+
+### Running Tests
+- Use `trino_integration_test.sh` script to run tests
+- Core tool class is `TrinoQueryTestTool`
+- Supports multiple test modes and flexible configuration
+
+### Adding/Modifying Tests
+1. Create `.sql` file to define test SQL
+2. Use `--gen_output` to generate expected output
+3. Use wildcard `%` to make expected output flexible
+4. Keep tests independent and data volume appropriate
diff --git a/.github/workflows/backend-integration-test-action.yml
b/.github/workflows/backend-integration-test-action.yml
index 266e2a8146..ac5db7c170 100644
--- a/.github/workflows/backend-integration-test-action.yml
+++ b/.github/workflows/backend-integration-test-action.yml
@@ -80,4 +80,6 @@ jobs:
distribution/package/logs/*.log
catalogs/**/*.log
catalogs/**/*.tar
+ catalogs-contrib/**/*.log
+ catalogs-contrib/**/*.tar
distribution/**/*.log
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c3408c0824..fab4f66a4b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -15,7 +15,7 @@ concurrency:
# A workflow run is made up of one or more jobs that can run sequentially or
in parallel
jobs:
changes:
- runs-on: ubuntu-latest
+ runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36
@@ -43,11 +43,15 @@ jobs:
- '!**/*.md'
- '!**/*.png'
- '!**/*.svg'
+ - 'mcp-server/**'
spark_connector_changes:
- spark-connector/**
+ mcp_server_changes:
+ - mcp-server/**
outputs:
source_changes: ${{ steps.filter.outputs.source_changes }}
spark_connector_changes: ${{
steps.filter.outputs.spark_connector_changes }}
+ mcp_server_changes: ${{ steps.filter.outputs.mcp_server_changes }}
compile-check:
runs-on: ubuntu-latest
@@ -133,8 +137,13 @@ jobs:
sudo dpkg -i libssl1.1_1.1.1f-1ubuntu2_amd64.deb
- name: Build with Gradle
+ if: needs.changes.outputs.mcp_server_changes == 'true'
run: ./gradlew build -PskipITs -PskipDockerTests=false -x
:clients:client-python:build
+ - name: Build with Gradle (skip mcp-server tests)
+ if: needs.changes.outputs.mcp_server_changes != 'true'
+ run: ./gradlew build -PskipITs -PskipDockerTests=false -x
:clients:client-python:build -x :mcp-server:build -x :mcp-server:test -x
:mcp-server:pylint
+
- name: Release with Gradle
run: ./gradlew clean && ./gradlew release -x test --rerun-tasks
@@ -145,5 +154,7 @@ jobs:
name: unit test report
path: |
build/reports
+ catalogs-contrib/**/*.log
+ catalogs-contrib/**/*.tar
catalogs/**/*.log
catalogs/**/*.tar
diff --git a/build.gradle.kts b/build.gradle.kts
index bc24e76790..8a41be6ec3 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -862,6 +862,7 @@ tasks {
val compileTrinoConnector by registering {
dependsOn("trino-connector:trino-connector-435-439:copyLibs")
dependsOn("trino-connector:trino-connector-440-445:copyLibs")
+ dependsOn("trino-connector:trino-connector-446-451:copyLibs")
group = "gravitino distribution"
outputs.dir(projectDir.dir("distribution/${rootProject.name}-trino-connector-435-439"))
}
diff --git
a/catalogs/catalog-jdbc-oceanbase/src/test/java/org/apache/gravitino/catalog/oceanbase/integration/test/CatalogOceanBaseIT.java
b/catalogs/catalog-jdbc-oceanbase/src/test/java/org/apache/gravitino/catalog/oceanbase/integration/test/CatalogOceanBaseIT.java
index 60ef1c1a37..6b8e2771aa 100644
---
a/catalogs/catalog-jdbc-oceanbase/src/test/java/org/apache/gravitino/catalog/oceanbase/integration/test/CatalogOceanBaseIT.java
+++
b/catalogs/catalog-jdbc-oceanbase/src/test/java/org/apache/gravitino/catalog/oceanbase/integration/test/CatalogOceanBaseIT.java
@@ -75,6 +75,7 @@ import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
@@ -84,6 +85,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@Tag("gravitino-docker-test")
+@Disabled
@TestInstance(Lifecycle.PER_CLASS)
public class CatalogOceanBaseIT extends BaseIT {
private static final Logger LOG =
LoggerFactory.getLogger(CatalogOceanBaseIT.class);
diff --git
a/catalogs/catalog-jdbc-oceanbase/src/test/java/org/apache/gravitino/catalog/oceanbase/operation/TestOceanBaseDatabaseOperations.java
b/catalogs/catalog-jdbc-oceanbase/src/test/java/org/apache/gravitino/catalog/oceanbase/operation/TestOceanBaseDatabaseOperations.java
index df27c6b70b..2564b39a6a 100644
---
a/catalogs/catalog-jdbc-oceanbase/src/test/java/org/apache/gravitino/catalog/oceanbase/operation/TestOceanBaseDatabaseOperations.java
+++
b/catalogs/catalog-jdbc-oceanbase/src/test/java/org/apache/gravitino/catalog/oceanbase/operation/TestOceanBaseDatabaseOperations.java
@@ -23,10 +23,12 @@ import java.util.List;
import java.util.Map;
import org.apache.gravitino.utils.RandomNameUtils;
import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
@Tag("gravitino-docker-test")
+@Disabled
public class TestOceanBaseDatabaseOperations extends TestOceanBase {
@Test
diff --git
a/catalogs/catalog-jdbc-oceanbase/src/test/java/org/apache/gravitino/catalog/oceanbase/operation/TestOceanBaseTableOperations.java
b/catalogs/catalog-jdbc-oceanbase/src/test/java/org/apache/gravitino/catalog/oceanbase/operation/TestOceanBaseTableOperations.java
index cedcabe038..2448facfe5 100644
---
a/catalogs/catalog-jdbc-oceanbase/src/test/java/org/apache/gravitino/catalog/oceanbase/operation/TestOceanBaseTableOperations.java
+++
b/catalogs/catalog-jdbc-oceanbase/src/test/java/org/apache/gravitino/catalog/oceanbase/operation/TestOceanBaseTableOperations.java
@@ -43,10 +43,12 @@ import org.apache.gravitino.rel.types.Types;
import org.apache.gravitino.utils.RandomNameUtils;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;
@Tag("gravitino-docker-test")
+@Disabled
public class TestOceanBaseTableOperations extends TestOceanBase {
private static final Type VARCHAR = Types.VarCharType.of(255);
private static final Type INT = Types.IntegerType.get();
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 0ac9055b79..fd3eb64901 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -71,7 +71,7 @@ trino = '435'
scala-collection-compat = "2.7.0"
scala-java-compat = "1.0.2"
sqlite-jdbc = "3.42.0.0"
-testcontainers = "1.20.6"
+testcontainers = "1.21.4"
jwt = "0.11.1"
nimbus-jose-jwt = "9.37.3"
jline = "3.21.0"
diff --git a/integration-test-common/docker-script/docker-compose.yaml
b/integration-test-common/docker-script/docker-compose.yaml
index e37eda30a8..37d90fae33 100644
--- a/integration-test-common/docker-script/docker-compose.yaml
+++ b/integration-test-common/docker-script/docker-compose.yaml
@@ -79,7 +79,7 @@ services:
retries: 5
trino:
- image: trinodb/trino:${TRINO_VERSION:-440}
+ image: trinodb/trino:${TRINO_VERSION:-446}
networks:
- trino-net
container_name: trino-ci-trino
@@ -94,7 +94,7 @@ services:
entrypoint: /bin/bash /tmp/trino/init.sh
volumes:
- ./init/trino:/tmp/trino
- -
${GRAVITINO_TRINO_CONNECTOR_DIR:-../../trino-connector/trino-connector-440-445/build/libs}:/usr/lib/trino/plugin/gravitino
+ -
${GRAVITINO_TRINO_CONNECTOR_DIR:-../../trino-connector/trino-connector-446-451/build/libs}:/usr/lib/trino/plugin/gravitino
extra_hosts:
- "host.docker.internal:host-gateway"
healthcheck:
@@ -113,7 +113,7 @@ services:
condition: service_healthy
trino-worker:
- image: trinodb/trino:${TRINO_VERSION:-440}
+ image: trinodb/trino:${TRINO_VERSION:-446}
networks:
- trino-net
deploy:
@@ -128,7 +128,7 @@ services:
entrypoint: /bin/bash /tmp/trino/init.sh
volumes:
- ./init/trino:/tmp/trino
- -
${GRAVITINO_TRINO_CONNECTOR_DIR:-../../trino-connector/trino-connector-440-445/build/libs}:/usr/lib/trino/plugin/gravitino
+ -
${GRAVITINO_TRINO_CONNECTOR_DIR:-../../trino-connector/trino-connector-446-451/build/libs}:/usr/lib/trino/plugin/gravitino
extra_hosts:
- "host.docker.internal:host-gateway"
depends_on:
diff --git
a/integration-test-common/src/test/java/org/apache/gravitino/integration/test/container/ContainerSuite.java
b/integration-test-common/src/test/java/org/apache/gravitino/integration/test/container/ContainerSuite.java
index 51d0030c10..689fc62872 100644
---
a/integration-test-common/src/test/java/org/apache/gravitino/integration/test/container/ContainerSuite.java
+++
b/integration-test-common/src/test/java/org/apache/gravitino/integration/test/container/ContainerSuite.java
@@ -36,6 +36,9 @@ import java.util.Map;
import java.util.NoSuchElementException;
import java.util.Objects;
import org.apache.gravitino.integration.test.util.CloseableGroup;
+import org.apache.gravitino.integration.test.util.CommandExecutor;
+import org.apache.gravitino.integration.test.util.ITUtils;
+import org.apache.gravitino.integration.test.util.ProcessData;
import org.apache.gravitino.integration.test.util.TestDatabaseName;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -131,6 +134,7 @@ public class ContainerSuite implements Closeable {
builder.putAll(env);
builder.put("HADOOP_USER_NAME", "anonymous");
+ ITUtils.cleanDisk();
if (hiveContainer == null) {
synchronized (ContainerSuite.class) {
if (hiveContainer == null) {
@@ -153,7 +157,7 @@ public class ContainerSuite implements Closeable {
ImmutableMap.Builder<String, String> builder = ImmutableMap.builder();
builder.putAll(env);
builder.put("HADOOP_USER_NAME", "anonymous");
-
+ ITUtils.cleanDisk();
if (hiveContainerWithS3 == null) {
synchronized (ContainerSuite.class) {
if (hiveContainerWithS3 == null) {
@@ -198,6 +202,7 @@ public class ContainerSuite implements Closeable {
throw new IllegalArgumentException("Error environment variables for Hive
Ranger container");
}
+ ITUtils.cleanDisk();
if (hiveRangerContainer == null) {
synchronized (ContainerSuite.class) {
if (hiveRangerContainer == null) {
@@ -216,6 +221,7 @@ public class ContainerSuite implements Closeable {
}
public void startKerberosHiveContainer(Map<String, String> envVars) {
+ ITUtils.cleanDisk();
if (kerberosHiveContainer == null) {
synchronized (ContainerSuite.class) {
if (kerberosHiveContainer == null) {
@@ -272,6 +278,7 @@ public class ContainerSuite implements Closeable {
String trinoConnectorLibDir,
int gravitinoServerPort,
String metalakeName) {
+ ITUtils.cleanDisk();
if (trinoContainer == null) {
synchronized (ContainerSuite.class) {
if (trinoContainer == null) {
@@ -313,6 +320,7 @@ public class ContainerSuite implements Closeable {
}
public void startDorisContainer() {
+ ITUtils.cleanDisk();
if (dorisContainer == null) {
synchronized (ContainerSuite.class) {
if (dorisContainer == null) {
@@ -329,6 +337,7 @@ public class ContainerSuite implements Closeable {
}
public void startMySQLContainer(TestDatabaseName testDatabaseName) {
+ ITUtils.cleanDisk();
if (mySQLContainer == null) {
synchronized (ContainerSuite.class) {
if (mySQLContainer == null) {
@@ -356,6 +365,7 @@ public class ContainerSuite implements Closeable {
}
public void startMySQLVersion5Container(TestDatabaseName testDatabaseName) {
+ ITUtils.cleanDisk();
if (mySQLVersion5Container == null) {
synchronized (ContainerSuite.class) {
if (mySQLVersion5Container == null) {
@@ -384,6 +394,7 @@ public class ContainerSuite implements Closeable {
}
public void startPostgreSQLContainer(TestDatabaseName testDatabaseName,
PGImageName pgImageName) {
+ ITUtils.cleanDisk();
if (!pgContainerMap.containsKey(pgImageName)) {
synchronized (ContainerSuite.class) {
if (!pgContainerMap.containsKey(pgImageName)) {
@@ -418,6 +429,13 @@ public class ContainerSuite implements Closeable {
}
public void startOceanBaseContainer() {
+ ITUtils.cleanDisk();
+ // create dir /tmp/obdata by CommandExecutor
+ Object o =
+ CommandExecutor.executeCommandLocalHost(
+ "mkdir -p /tmp/obdata", false,
ProcessData.TypesOfData.STREAMS_MERGED);
+ LOG.info("Command mkdir -p /tmp/obdata output:\n{}", o);
+
if (oceanBaseContainer == null) {
synchronized (ContainerSuite.class) {
if (oceanBaseContainer == null) {
@@ -428,16 +446,20 @@ public class ContainerSuite implements Closeable {
.withEnvVars(
ImmutableMap.of(
"MODE",
- "mini",
+ "MINI",
"OB_SYS_PASSWORD",
OceanBaseContainer.PASSWORD,
"OB_TENANT_PASSWORD",
OceanBaseContainer.PASSWORD,
"OB_DATAFILE_SIZE",
- "2G",
+ "1G",
"OB_LOG_DISK_SIZE",
+ "2G",
+ "OB_MEMORY_LIMIT",
"4G"))
.withNetwork(network)
+ .withFilesToMount(
+ ImmutableMap.<String,
String>builder().put("/tmp/obdata", "/root/ob").build())
.withExposePorts(ImmutableSet.of(OceanBaseContainer.OCEANBASE_PORT));
OceanBaseContainer container =
closer.register(oceanBaseBuilder.build());
container.start();
@@ -448,6 +470,7 @@ public class ContainerSuite implements Closeable {
}
public void startKafkaContainer() {
+ ITUtils.cleanDisk();
if (kafkaContainer == null) {
synchronized (ContainerSuite.class) {
if (kafkaContainer == null) {
@@ -467,6 +490,7 @@ public class ContainerSuite implements Closeable {
}
public void startLocalStackContainer() {
+ ITUtils.cleanDisk();
if (gravitinoLocalStackContainer == null) {
synchronized (ContainerSuite.class) {
if (gravitinoLocalStackContainer == null) {
@@ -486,6 +510,7 @@ public class ContainerSuite implements Closeable {
}
public void startStarRocksContainer() {
+ ITUtils.cleanDisk();
if (starRocksContainer == null) {
synchronized (ContainerSuite.class) {
if (starRocksContainer == null) {
diff --git
a/integration-test-common/src/test/java/org/apache/gravitino/integration/test/container/TrinoITContainers.java
b/integration-test-common/src/test/java/org/apache/gravitino/integration/test/container/TrinoITContainers.java
index d5b2636d6c..16b6e67a5d 100644
---
a/integration-test-common/src/test/java/org/apache/gravitino/integration/test/container/TrinoITContainers.java
+++
b/integration-test-common/src/test/java/org/apache/gravitino/integration/test/container/TrinoITContainers.java
@@ -19,9 +19,7 @@
package org.apache.gravitino.integration.test.container;
import com.google.common.collect.ImmutableSet;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
+import java.io.File;
import java.util.HashMap;
import java.util.Map;
import org.apache.gravitino.integration.test.util.CommandExecutor;
@@ -73,9 +71,11 @@ public class TrinoITContainers implements AutoCloseable {
env.put("TRINO_VERSION", String.valueOf(trinoVersion));
}
if (trinoConnectorDir != null) {
- Path path = Paths.get(trinoConnectorDir);
- if (!Files.exists(path)) {
- throw new Exception("Provided GRAVITINO_TRINO_CONNECTOR_DIR '" + path
+ "' does not exist");
+ File dir = new File(trinoConnectorDir);
+ if (!dir.exists() || dir.list().length == 0) {
+ throw new Exception(
+ "Gravitino trino connector directory %s is not exist or empty"
+ .formatted(trinoConnectorDir));
}
env.put("GRAVITINO_TRINO_CONNECTOR_DIR", trinoConnectorDir);
}
diff --git
a/integration-test-common/src/test/java/org/apache/gravitino/integration/test/util/ITUtils.java
b/integration-test-common/src/test/java/org/apache/gravitino/integration/test/util/ITUtils.java
index 508c5fb42e..e9dbe940da 100644
---
a/integration-test-common/src/test/java/org/apache/gravitino/integration/test/util/ITUtils.java
+++
b/integration-test-common/src/test/java/org/apache/gravitino/integration/test/util/ITUtils.java
@@ -46,8 +46,11 @@ import
org.apache.gravitino.rel.expressions.transforms.Transform;
import org.apache.gravitino.rel.indexes.Index;
import org.apache.gravitino.rel.partitions.Partition;
import org.junit.jupiter.api.Assertions;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class ITUtils {
+ private static final Logger LOG = LoggerFactory.getLogger(ITUtils.class);
public static final String TEST_MODE = "testMode";
public static final String EMBEDDED_TEST_MODE = "embedded";
@@ -206,5 +209,41 @@ public class ITUtils {
System.getenv("GRAVITINO_ROOT_DIR"), "bundles", bundleName, "build",
"libs");
}
+ public static void cleanDisk() {
+
+ Object output =
+ CommandExecutor.executeCommandLocalHost(
+ "df -h", false, ProcessData.TypesOfData.STREAMS_MERGED, Map.of());
+ LOG.info("Before clean: Command df -h output:\n{}", output);
+ output =
+ CommandExecutor.executeCommandLocalHost(
+ "free -m", false, ProcessData.TypesOfData.STREAMS_MERGED,
Map.of());
+ LOG.info("Before clean: Command free -m output:\n{}", output);
+
+ // Execute docker system prune -af to free up space before starting the
OceanBase container
+ ProcessBuilder processBuilder = new ProcessBuilder("/bin/bash", "-c",
"docker system prune -f");
+ try {
+ Process process = processBuilder.start();
+ int exitCode = process.waitFor();
+ if (exitCode != 0) {
+ throw new RuntimeException("Failed to execute free memory exit code: "
+ exitCode);
+ }
+ } catch (IOException e) {
+ throw new RuntimeException("Failed to execute free memory command", e);
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ throw new RuntimeException("Interrupted while waiting for
util_free_space.sh to finish", e);
+ }
+
+ output =
+ CommandExecutor.executeCommandLocalHost(
+ "df -h", false, ProcessData.TypesOfData.STREAMS_MERGED, Map.of());
+ LOG.info("After clean: Command df -h output:\n{}", output);
+ output =
+ CommandExecutor.executeCommandLocalHost(
+ "free -m", false, ProcessData.TypesOfData.STREAMS_MERGED,
Map.of());
+ LOG.info("After clean: Command free -m output:\n{}", output);
+ }
+
private ITUtils() {}
}
diff --git a/settings.gradle.kts b/settings.gradle.kts
index f357554918..a79f8da9b5 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -67,6 +67,7 @@ include(
"trino-connector:trino-connector",
"trino-connector:trino-connector-435-439",
"trino-connector:trino-connector-440-445",
+ "trino-connector:trino-connector-446-451",
"trino-connector:integration-test"
)
include("spark-connector:spark-common")
diff --git a/trino-connector/integration-test/build.gradle.kts
b/trino-connector/integration-test/build.gradle.kts
index 6b5988bc67..ef21ba21c4 100644
--- a/trino-connector/integration-test/build.gradle.kts
+++ b/trino-connector/integration-test/build.gradle.kts
@@ -71,8 +71,9 @@ dependencies {
}
tasks.register("setupDependencies") {
- dependsOn(":trino-connector:trino-connector-435-439:jar")
- dependsOn(":trino-connector:trino-connector-440-445:jar")
+ dependsOn(":trino-connector:trino-connector-435-439:copyLibs")
+ dependsOn(":trino-connector:trino-connector-440-445:copyLibs")
+ dependsOn(":trino-connector:trino-connector-446-451:copyLibs")
dependsOn(":catalogs:catalog-lakehouse-iceberg:jar",
":catalogs:catalog-lakehouse-iceberg:runtimeJars")
dependsOn(":catalogs:catalog-jdbc-mysql:jar",
":catalogs:catalog-jdbc-mysql:runtimeJars")
dependsOn(":catalogs:catalog-jdbc-postgresql:jar",
":catalogs:catalog-jdbc-postgresql:runtimeJars")
diff --git
a/trino-connector/integration-test/src/test/java/org/apache/gravitino/trino/connector/integration/test/TrinoQueryIT.java
b/trino-connector/integration-test/src/test/java/org/apache/gravitino/trino/connector/integration/test/TrinoQueryIT.java
index ef06725de9..2637ef9c67 100644
---
a/trino-connector/integration-test/src/test/java/org/apache/gravitino/trino/connector/integration/test/TrinoQueryIT.java
+++
b/trino-connector/integration-test/src/test/java/org/apache/gravitino/trino/connector/integration/test/TrinoQueryIT.java
@@ -18,6 +18,7 @@
*/
package org.apache.gravitino.trino.connector.integration.test;
+import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
@@ -338,6 +339,7 @@ public class TrinoQueryIT extends TrinoQueryITBase {
String[] testSetNames =
Arrays.stream(TrinoQueryITBase.listDirectory(testsetsDir))
+ .filter(s -> new File(ITUtils.joinPath(testsetsDir,
s)).isDirectory())
.filter(s -> ciTestsets.isEmpty() || ciTestsets.contains(s))
.toArray(String[]::new);
List<Future<Integer>> allFutures = new ArrayList<>();
diff --git
a/trino-connector/integration-test/src/test/resources/trino-ci-testset/testsets/jdbc-mysql/00004_query_pushdown.txt
b/trino-connector/integration-test/src/test/resources/trino-ci-testset/testsets/jdbc-mysql/00004_query_pushdown.txt
index bef98d37b8..d1c050b4d0 100644
---
a/trino-connector/integration-test/src/test/resources/trino-ci-testset/testsets/jdbc-mysql/00004_query_pushdown.txt
+++
b/trino-connector/integration-test/src/test/resources/trino-ci-testset/testsets/jdbc-mysql/00004_query_pushdown.txt
@@ -12,35 +12,32 @@ INSERT: 15000 rows
"Trino version: %
%
- └─ TableScan[table = gt_mysql:gt_db1.customer->gt_db1.customer
gt_db1.customer limit=10 columns=[custkey:bigint:BIGINT]]
+ %TableScan[table = gt_mysql:gt_db1.customer->gt_db1.customer
gt_db1.customer limit=10 columns=[custkey:bigint:BIGINT]]
Layout: [custkey:bigint]
%
"
"Trino version: %
%
- └─ ScanFilter[table = gt_mysql:gt_db1.customer->gt_db1.customer
gt_db1.customer, filterPredicate = ""$like""(""phone"",
""$literal$""(from_base64('DgAAAFZBUklBQkxFX1dJRFRIAQAAAAEAAAALAAAAAAsAAAAGAAAAJTIzNDIlAA==')))]
- Layout: [custkey:bigint, name:varchar(25), address:varchar(40),
nationkey:bigint, phone:varchar(15), acctbal:decimal(12,2),
mktsegment:varchar(10), comment:varchar(117)]
+ %ScanFilter[table = gt_mysql:gt_db1.customer->gt_db1.customer
gt_db1.customer%like%phone%]
%
"
"Trino version: %
%
- └─ TableScan[table = gt_mysql:gt_db1.orders->Query[SELECT
sum(`totalprice`) AS `_pfgnrtd_0` FROM `gt_db1`.`orders`]
columns=[_pfgnrtd_0:decimal(38,2):decimal]]
- Layout: [_pfgnrtd:decimal(38,2)]
+ %TableScan[table = gt_mysql:gt_db1.orders->Query[SELECT sum(`totalprice`)
AS `_pfgnrtd_0` FROM
`gt_db1`.`orders`]%columns=[_pfgnrtd_0:decimal(38,2):decimal]]
%
"
"Trino version: %
%
- └─ TableScan[table = gt_mysql:gt_db1.orders->Query[SELECT `orderdate`,
sum(`totalprice`) AS `_pfgnrtd_0` FROM `gt_db1`.`orders` GROUP BY `orderdate`]
sortOrder=[orderdate:date:DATE ASC NULLS LAST] limit=10
columns=[orderdate:date:DATE, _pfgnrtd_0:decimal(38,2):decimal]]
- Layout: [orderdate:date, _pfgnrtd:decimal(38,2)]
+ %TableScan[table = gt_mysql:gt_db1.orders->Query[SELECT `orderdate`,
sum(`totalprice`) AS `_pfgnrtd_0` FROM `gt_db1`.`orders` GROUP BY
`orderdate`]%sortOrder=[orderdate:date:DATE ASC NULLS
LAST]%limit=10%columns=[orderdate:date:DATE, _pfgnrtd_0:decimal(38,2):decimal]]
%
"
"Trino version: %
%
- └─ TableScan[table = gt_mysql:gt_db1.%->Query[SELECT % INNER JOIN %]
limit=10 columns=%]]
+ %TableScan[table = gt_mysql:gt_db1.%->Query[SELECT % INNER JOIN
%]%limit=10%columns=%]%
%
"
diff --git
a/trino-connector/integration-test/src/test/resources/trino-ci-testset/testsets/jdbc-postgresql/00004_query_pushdown.txt
b/trino-connector/integration-test/src/test/resources/trino-ci-testset/testsets/jdbc-postgresql/00004_query_pushdown.txt
index c0d96d0864..c4f271adde 100644
---
a/trino-connector/integration-test/src/test/resources/trino-ci-testset/testsets/jdbc-postgresql/00004_query_pushdown.txt
+++
b/trino-connector/integration-test/src/test/resources/trino-ci-testset/testsets/jdbc-postgresql/00004_query_pushdown.txt
@@ -12,35 +12,32 @@ INSERT: 15000 rows
"Trino version: %
%
- └─ TableScan[table = gt_postgresql:gt_db1.customer->gt_db1.customer
gt_db1.customer limit=10 columns=[custkey:bigint:int8]]
+ %TableScan[table = gt_postgresql:gt_db1.customer->gt_db1.customer
gt_db1.customer limit=10 columns=[custkey:bigint:int8]]
Layout: [custkey:bigint]
%
"
"Trino version: %
%
- └─ TableScan[table = gt_postgresql:gt_db1.customer->gt_db1.customer
gt_db1.customer constraints=[ParameterizedExpression[expression=(""phone"")
LIKE (?), parameters=[QueryParameter{jdbcType=Optional.empty, type=varchar(6),
value=Optional[Slice{base=[B@%, baseOffset=0, length=6}]}]]] limit=10]
- Layout: [custkey:bigint, name:varchar(25), address:varchar(40),
nationkey:bigint, phone:varchar(15), acctbal:decimal(12,2),
mktsegment:varchar(10), comment:varchar(117)]
+ %TableScan[table = gt_postgresql:gt_db1.customer->gt_db1.customer
gt_db1.customer%constraints=%phone%LIKE%]
%
"
"Trino version: %
%
- └─ TableScan[table = gt_postgresql:gt_db1.orders->Query[SELECT
sum(""totalprice"") AS ""_pfgnrtd_0"" FROM ""gt_db1"".""orders""]
columns=[_pfgnrtd_0:decimal(38,2):decimal]]
- Layout: [_pfgnrtd:decimal(38,2)]
+ %TableScan[table = gt_postgresql:gt_db1.orders->Query[SELECT
sum(""totalprice"") AS ""_pfgnrtd_0"" FROM
""gt_db1"".""orders""]%columns=[_pfgnrtd_0:decimal(38,2):decimal]]
%
"
"Trino version: %
%
- └─ TableScan[table = gt_postgresql:gt_db1.%->Query[SELECT ""orderdate"",
sum(""totalprice"") AS ""_pfgnrtd_0"" FROM ""gt_db1"".""orders"" GROUP BY
""orderdate""] sortOrder=[orderdate:date:date ASC NULLS LAST] limit=10
columns=[orderdate:date:date, _pfgnrtd_0:decimal(38,2):decimal]]
- Layout: [orderdate:date, _pfgnrtd:decimal(38,2)]
+ %TableScan[table = gt_postgresql:gt_db1.%->Query[SELECT ""orderdate"",
sum(""totalprice"") AS ""_pfgnrtd_0"" FROM ""gt_db1"".""orders"" GROUP BY
""orderdate""]%sortOrder=[orderdate:date:date ASC NULLS
LAST]%limit=10%columns=[orderdate:date:date, _pfgnrtd_0:decimal(38,2):decimal]]
%
"
"Trino version: %
%
- TableScan[table = gt_postgresql:gt_db1.%->Query[SELECT % INNER JOIN %]
limit=10 columns=%]
+ %TableScan[table = gt_postgresql:gt_db1.%->Query[SELECT % INNER JOIN
%]%limit=10%columns=%]%
%
"
@@ -48,4 +45,4 @@ DROP TABLE
DROP TABLE
-DROP SCHEMA
\ No newline at end of file
+DROP SCHEMA
diff --git
a/trino-connector/integration-test/src/test/resources/trino-ci-testset/testsets/trino-435-445.patch
b/trino-connector/integration-test/src/test/resources/trino-ci-testset/testsets/trino-435-445.patch
new file mode 100644
index 0000000000..5d249a20cd
--- /dev/null
+++
b/trino-connector/integration-test/src/test/resources/trino-ci-testset/testsets/trino-435-445.patch
@@ -0,0 +1,97 @@
+diff --git
b/trino-connector/integration-test/src/test/resources/trino-ci-testset/testsets/jdbc-mysql/00004_query_pushdown.txt
a/trino-connector/integration-test/src/test/resources/trino-ci-testset/testsets/jdbc-mysql/00004_query_pushdown.txt
+index d1c050b4d..bef98d37b 100644
+---
b/trino-connector/integration-test/src/test/resources/trino-ci-testset/testsets/jdbc-mysql/00004_query_pushdown.txt
++++
a/trino-connector/integration-test/src/test/resources/trino-ci-testset/testsets/jdbc-mysql/00004_query_pushdown.txt
+@@ -12,32 +12,35 @@ INSERT: 15000 rows
+
+ "Trino version: %
+ %
+- %TableScan[table = gt_mysql:gt_db1.customer->gt_db1.customer
gt_db1.customer limit=10 columns=[custkey:bigint:BIGINT]]
++ └─ TableScan[table = gt_mysql:gt_db1.customer->gt_db1.customer
gt_db1.customer limit=10 columns=[custkey:bigint:BIGINT]]
+ Layout: [custkey:bigint]
+ %
+ "
+
+ "Trino version: %
+ %
+- %ScanFilter[table = gt_mysql:gt_db1.customer->gt_db1.customer
gt_db1.customer%like%phone%]
++ └─ ScanFilter[table = gt_mysql:gt_db1.customer->gt_db1.customer
gt_db1.customer, filterPredicate = ""$like""(""phone"",
""$literal$""(from_base64('DgAAAFZBUklBQkxFX1dJRFRIAQAAAAEAAAALAAAAAAsAAAAGAAAAJTIzNDIlAA==')))]
++ Layout: [custkey:bigint, name:varchar(25), address:varchar(40),
nationkey:bigint, phone:varchar(15), acctbal:decimal(12,2),
mktsegment:varchar(10), comment:varchar(117)]
+ %
+ "
+
+ "Trino version: %
+ %
+- %TableScan[table = gt_mysql:gt_db1.orders->Query[SELECT sum(`totalprice`)
AS `_pfgnrtd_0` FROM
`gt_db1`.`orders`]%columns=[_pfgnrtd_0:decimal(38,2):decimal]]
++ └─ TableScan[table = gt_mysql:gt_db1.orders->Query[SELECT
sum(`totalprice`) AS `_pfgnrtd_0` FROM `gt_db1`.`orders`]
columns=[_pfgnrtd_0:decimal(38,2):decimal]]
++ Layout: [_pfgnrtd:decimal(38,2)]
+ %
+ "
+
+ "Trino version: %
+ %
+- %TableScan[table = gt_mysql:gt_db1.orders->Query[SELECT `orderdate`,
sum(`totalprice`) AS `_pfgnrtd_0` FROM `gt_db1`.`orders` GROUP BY
`orderdate`]%sortOrder=[orderdate:date:DATE ASC NULLS
LAST]%limit=10%columns=[orderdate:date:DATE, _pfgnrtd_0:decimal(38,2):decimal]]
++ └─ TableScan[table = gt_mysql:gt_db1.orders->Query[SELECT `orderdate`,
sum(`totalprice`) AS `_pfgnrtd_0` FROM `gt_db1`.`orders` GROUP BY `orderdate`]
sortOrder=[orderdate:date:DATE ASC NULLS LAST] limit=10
columns=[orderdate:date:DATE, _pfgnrtd_0:decimal(38,2):decimal]]
++ Layout: [orderdate:date, _pfgnrtd:decimal(38,2)]
+ %
+ "
+
+ "Trino version: %
+ %
+- %TableScan[table = gt_mysql:gt_db1.%->Query[SELECT % INNER JOIN
%]%limit=10%columns=%]%
++ └─ TableScan[table = gt_mysql:gt_db1.%->Query[SELECT % INNER JOIN %]
limit=10 columns=%]]
+ %
+ "
+
+diff --git
b/trino-connector/integration-test/src/test/resources/trino-ci-testset/testsets/jdbc-postgresql/00004_query_pushdown.txt
a/trino-connector/integration-test/src/test/resources/trino-ci-testset/testsets/jdbc-postgresql/00004_query_pushdown.txt
+index c4f271add..c0d96d086 100644
+---
b/trino-connector/integration-test/src/test/resources/trino-ci-testset/testsets/jdbc-postgresql/00004_query_pushdown.txt
++++
a/trino-connector/integration-test/src/test/resources/trino-ci-testset/testsets/jdbc-postgresql/00004_query_pushdown.txt
+@@ -12,32 +12,35 @@ INSERT: 15000 rows
+
+ "Trino version: %
+ %
+- %TableScan[table = gt_postgresql:gt_db1.customer->gt_db1.customer
gt_db1.customer limit=10 columns=[custkey:bigint:int8]]
++ └─ TableScan[table = gt_postgresql:gt_db1.customer->gt_db1.customer
gt_db1.customer limit=10 columns=[custkey:bigint:int8]]
+ Layout: [custkey:bigint]
+ %
+ "
+
+ "Trino version: %
+ %
+- %TableScan[table = gt_postgresql:gt_db1.customer->gt_db1.customer
gt_db1.customer%constraints=%phone%LIKE%]
++ └─ TableScan[table = gt_postgresql:gt_db1.customer->gt_db1.customer
gt_db1.customer constraints=[ParameterizedExpression[expression=(""phone"")
LIKE (?), parameters=[QueryParameter{jdbcType=Optional.empty, type=varchar(6),
value=Optional[Slice{base=[B@%, baseOffset=0, length=6}]}]]] limit=10]
++ Layout: [custkey:bigint, name:varchar(25), address:varchar(40),
nationkey:bigint, phone:varchar(15), acctbal:decimal(12,2),
mktsegment:varchar(10), comment:varchar(117)]
+ %
+ "
+
+ "Trino version: %
+ %
+- %TableScan[table = gt_postgresql:gt_db1.orders->Query[SELECT
sum(""totalprice"") AS ""_pfgnrtd_0"" FROM
""gt_db1"".""orders""]%columns=[_pfgnrtd_0:decimal(38,2):decimal]]
++ └─ TableScan[table = gt_postgresql:gt_db1.orders->Query[SELECT
sum(""totalprice"") AS ""_pfgnrtd_0"" FROM ""gt_db1"".""orders""]
columns=[_pfgnrtd_0:decimal(38,2):decimal]]
++ Layout: [_pfgnrtd:decimal(38,2)]
+ %
+ "
+
+ "Trino version: %
+ %
+- %TableScan[table = gt_postgresql:gt_db1.%->Query[SELECT ""orderdate"",
sum(""totalprice"") AS ""_pfgnrtd_0"" FROM ""gt_db1"".""orders"" GROUP BY
""orderdate""]%sortOrder=[orderdate:date:date ASC NULLS
LAST]%limit=10%columns=[orderdate:date:date, _pfgnrtd_0:decimal(38,2):decimal]]
++ └─ TableScan[table = gt_postgresql:gt_db1.%->Query[SELECT ""orderdate"",
sum(""totalprice"") AS ""_pfgnrtd_0"" FROM ""gt_db1"".""orders"" GROUP BY
""orderdate""] sortOrder=[orderdate:date:date ASC NULLS LAST] limit=10
columns=[orderdate:date:date, _pfgnrtd_0:decimal(38,2):decimal]]
++ Layout: [orderdate:date, _pfgnrtd:decimal(38,2)]
+ %
+ "
+
+ "Trino version: %
+ %
+- %TableScan[table = gt_postgresql:gt_db1.%->Query[SELECT % INNER JOIN
%]%limit=10%columns=%]%
++ TableScan[table = gt_postgresql:gt_db1.%->Query[SELECT % INNER JOIN %]
limit=10 columns=%]
+ %
+ "
+
+@@ -45,4 +48,4 @@ DROP TABLE
+
+ DROP TABLE
+
+-DROP SCHEMA
++DROP SCHEMA
+\ No newline at end of file
diff --git
a/trino-connector/integration-test/trino-test-tools/run_test_with_versions.sh
b/trino-connector/integration-test/trino-test-tools/run_test_with_versions.sh
index 7061d0ad70..2dd6359acb 100755
---
a/trino-connector/integration-test/trino-test-tools/run_test_with_versions.sh
+++
b/trino-connector/integration-test/trino-test-tools/run_test_with_versions.sh
@@ -79,9 +79,9 @@ for entry in $trino_versions_map; do
# execute test
echo "Running test for Trino version: $trino_version with connector:
$trino_module_name"
echo "The args: $args"
-
+
sleep 5
-
$GRAVITINO_HOME_DIR/trino-connector/integration-test/trino-test-tools/trino_test.sh
$args
+
$GRAVITINO_HOME_DIR/trino-connector/integration-test/trino-test-tools/trino_integration_test.sh
$args
if [ $? -ne 0 ]; then
echo "Test failed for Trino version $trino_version"
diff --git a/trino-connector/trino-connector-440-445/build.gradle.kts
b/trino-connector/trino-connector-440-445/build.gradle.kts
index b922a8ff64..d7bddb39e7 100644
--- a/trino-connector/trino-connector-440-445/build.gradle.kts
+++ b/trino-connector/trino-connector-440-445/build.gradle.kts
@@ -30,6 +30,7 @@ plugins {
// This module supports Trino versions 440-445
val minTrinoVersion = 440
val maxTrinoVersion = 445
+val otelSemconvVersion = "1.23.1-alpha"
val trinoVersion = providers.gradleProperty("trinoVersion")
.map { it.trim().toInt() }
@@ -55,7 +56,7 @@ dependencies {
implementation(libs.commons.collections4)
implementation(libs.commons.lang3)
implementation("io.trino:trino-jdbc:$trinoVersion")
- runtimeOnly("io.opentelemetry.semconv:opentelemetry-semconv:1.23.1-alpha")
+
runtimeOnly("io.opentelemetry.semconv:opentelemetry-semconv:$otelSemconvVersion")
compileOnly(libs.airlift.resolver)
compileOnly("io.trino:trino-spi:$trinoVersion") {
exclude("org.apache.logging.log4j")
diff --git a/trino-connector/trino-connector-440-445/build.gradle.kts
b/trino-connector/trino-connector-446-451/build.gradle.kts
similarity index 95%
copy from trino-connector/trino-connector-440-445/build.gradle.kts
copy to trino-connector/trino-connector-446-451/build.gradle.kts
index b922a8ff64..6ae0102706 100644
--- a/trino-connector/trino-connector-440-445/build.gradle.kts
+++ b/trino-connector/trino-connector-446-451/build.gradle.kts
@@ -27,9 +27,10 @@ plugins {
`maven-publish`
}
-// This module supports Trino versions 440-445
-val minTrinoVersion = 440
-val maxTrinoVersion = 445
+// This module supports Trino versions 446-451
+val minTrinoVersion = 446
+val maxTrinoVersion = 451
+val otelSemconvVersion = "1.25.0-alpha"
val trinoVersion = providers.gradleProperty("trinoVersion")
.map { it.trim().toInt() }
@@ -55,7 +56,7 @@ dependencies {
implementation(libs.commons.collections4)
implementation(libs.commons.lang3)
implementation("io.trino:trino-jdbc:$trinoVersion")
- runtimeOnly("io.opentelemetry.semconv:opentelemetry-semconv:1.23.1-alpha")
+
runtimeOnly("io.opentelemetry.semconv:opentelemetry-semconv-incubating:$otelSemconvVersion")
compileOnly(libs.airlift.resolver)
compileOnly("io.trino:trino-spi:$trinoVersion") {
exclude("org.apache.logging.log4j")
diff --git
a/trino-connector/trino-connector-446-451/src/main/java/org/apache/gravitino/trino/connector/GravitinoConnector446.java
b/trino-connector/trino-connector-446-451/src/main/java/org/apache/gravitino/trino/connector/GravitinoConnector446.java
new file mode 100644
index 0000000000..f222edc471
--- /dev/null
+++
b/trino-connector/trino-connector-446-451/src/main/java/org/apache/gravitino/trino/connector/GravitinoConnector446.java
@@ -0,0 +1,55 @@
+/*
+ * 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.gravitino.trino.connector;
+
+import io.trino.spi.connector.ConnectorMetadata;
+import io.trino.spi.connector.ConnectorNodePartitioningProvider;
+import io.trino.spi.connector.ConnectorSplitManager;
+import org.apache.gravitino.trino.connector.catalog.CatalogConnectorContext;
+import org.apache.gravitino.trino.connector.catalog.CatalogConnectorMetadata;
+import
org.apache.gravitino.trino.connector.catalog.CatalogConnectorMetadataAdapter;
+
+public class GravitinoConnector446 extends GravitinoConnector {
+
+ public GravitinoConnector446(CatalogConnectorContext connectorContext) {
+ super(connectorContext);
+ }
+
+ @Override
+ protected GravitinoMetadata createGravitinoMetadata(
+ CatalogConnectorMetadata catalogConnectorMetadata,
+ CatalogConnectorMetadataAdapter metadataAdapter,
+ ConnectorMetadata internalMetadata) {
+ return new GravitinoMetadata446(catalogConnectorMetadata, metadataAdapter,
internalMetadata);
+ }
+
+ @Override
+ public ConnectorSplitManager getSplitManager() {
+ ConnectorSplitManager splitManager =
+ catalogConnectorContext.getInternalConnector().getSplitManager();
+ return new GravitinoSplitManager446(splitManager);
+ }
+
+ @Override
+ public ConnectorNodePartitioningProvider getNodePartitioningProvider() {
+ ConnectorNodePartitioningProvider nodePartitioningProvider =
+
catalogConnectorContext.getInternalConnector().getNodePartitioningProvider();
+ return new GravitinoNodePartitioningProvider446(nodePartitioningProvider);
+ }
+}
diff --git
a/trino-connector/trino-connector-446-451/src/main/java/org/apache/gravitino/trino/connector/GravitinoConnectorFactory446.java
b/trino-connector/trino-connector-446-451/src/main/java/org/apache/gravitino/trino/connector/GravitinoConnectorFactory446.java
new file mode 100644
index 0000000000..39e273e0a3
--- /dev/null
+++
b/trino-connector/trino-connector-446-451/src/main/java/org/apache/gravitino/trino/connector/GravitinoConnectorFactory446.java
@@ -0,0 +1,57 @@
+/*
+ * 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.gravitino.trino.connector;
+
+import org.apache.gravitino.client.GravitinoAdminClient;
+import org.apache.gravitino.trino.connector.catalog.CatalogConnectorContext;
+import org.apache.gravitino.trino.connector.system.GravitinoSystemConnector;
+import
org.apache.gravitino.trino.connector.system.storedprocedure.GravitinoStoredProcedureFactory;
+
+public class GravitinoConnectorFactory446 extends GravitinoConnectorFactory {
+
+ public GravitinoConnectorFactory446(GravitinoAdminClient client) {
+ super(client);
+ }
+
+ @Override
+ protected int getMinSupportTrinoSpiVersion() {
+ return 446;
+ }
+
+ @Override
+ protected int getMaxSupportTrinoSpiVersion() {
+ return 451;
+ }
+
+ @Override
+ protected boolean supportCatalogNameWithMetalake() {
+ return false;
+ }
+
+ @Override
+ protected GravitinoConnector createConnector(CatalogConnectorContext
connectorContext) {
+ return new GravitinoConnector446(connectorContext);
+ }
+
+ @Override
+ protected GravitinoSystemConnector createSystemConnector(
+ GravitinoStoredProcedureFactory storedProcedureFactory) {
+ return new GravitinoSystemConnector446(storedProcedureFactory);
+ }
+}
diff --git
a/trino-connector/trino-connector-446-451/src/main/java/org/apache/gravitino/trino/connector/GravitinoMetadata446.java
b/trino-connector/trino-connector-446-451/src/main/java/org/apache/gravitino/trino/connector/GravitinoMetadata446.java
new file mode 100644
index 0000000000..86345379c9
--- /dev/null
+++
b/trino-connector/trino-connector-446-451/src/main/java/org/apache/gravitino/trino/connector/GravitinoMetadata446.java
@@ -0,0 +1,90 @@
+/*
+ * 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.gravitino.trino.connector;
+
+import io.airlift.slice.Slice;
+import io.trino.spi.connector.ColumnMetadata;
+import io.trino.spi.connector.ConnectorInsertTableHandle;
+import io.trino.spi.connector.ConnectorMergeTableHandle;
+import io.trino.spi.connector.ConnectorOutputMetadata;
+import io.trino.spi.connector.ConnectorSession;
+import io.trino.spi.connector.ConnectorTableHandle;
+import io.trino.spi.connector.RetryMode;
+import io.trino.spi.connector.SchemaTableName;
+import io.trino.spi.statistics.ComputedStatistics;
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import org.apache.gravitino.trino.connector.catalog.CatalogConnectorMetadata;
+import
org.apache.gravitino.trino.connector.catalog.CatalogConnectorMetadataAdapter;
+import org.apache.gravitino.trino.connector.metadata.GravitinoColumn;
+
+public class GravitinoMetadata446 extends GravitinoMetadata {
+
+ public GravitinoMetadata446(
+ CatalogConnectorMetadata catalogConnectorMetadata,
+ CatalogConnectorMetadataAdapter metadataAdapter,
+ io.trino.spi.connector.ConnectorMetadata internalMetadata) {
+ super(catalogConnectorMetadata, metadataAdapter, internalMetadata);
+ }
+
+ @Override
+ public void addColumn(
+ ConnectorSession session, ConnectorTableHandle tableHandle,
ColumnMetadata column) {
+ GravitinoColumn gravitinoColumn = metadataAdapter.createColumn(column);
+ catalogConnectorMetadata.addColumn(getTableName(tableHandle),
gravitinoColumn);
+ }
+
+ @Override
+ public Optional<ConnectorOutputMetadata> finishInsert(
+ ConnectorSession session,
+ ConnectorInsertTableHandle insertHandle,
+ List<ConnectorTableHandle> sourceTableHandles,
+ Collection<Slice> fragments,
+ Collection<ComputedStatistics> computedStatistics) {
+ return internalMetadata.finishInsert(
+ session,
+ GravitinoHandle.unWrap(insertHandle),
+
sourceTableHandles.stream().map(GravitinoHandle::unWrap).collect(Collectors.toList()),
+ fragments,
+ computedStatistics);
+ }
+
+ @Override
+ public ConnectorMergeTableHandle beginMerge(
+ ConnectorSession session, ConnectorTableHandle tableHandle, RetryMode
retryMode) {
+ ConnectorMergeTableHandle connectorMergeTableHandle =
+ internalMetadata.beginMerge(session,
GravitinoHandle.unWrap(tableHandle), retryMode);
+ SchemaTableName tableName = getTableName(tableHandle);
+
+ return new GravitinoMergeTableHandle(
+ tableName.getSchemaName(), tableName.getTableName(),
connectorMergeTableHandle);
+ }
+
+ @Override
+ public void finishMerge(
+ ConnectorSession session,
+ ConnectorMergeTableHandle mergeTableHandle,
+ Collection<Slice> fragments,
+ Collection<ComputedStatistics> computedStatistics) {
+ internalMetadata.finishMerge(
+ session, GravitinoHandle.unWrap(mergeTableHandle), fragments,
computedStatistics);
+ }
+}
diff --git
a/trino-connector/trino-connector-446-451/src/main/java/org/apache/gravitino/trino/connector/GravitinoNodePartitioningProvider446.java
b/trino-connector/trino-connector-446-451/src/main/java/org/apache/gravitino/trino/connector/GravitinoNodePartitioningProvider446.java
new file mode 100644
index 0000000000..552107ce92
--- /dev/null
+++
b/trino-connector/trino-connector-446-451/src/main/java/org/apache/gravitino/trino/connector/GravitinoNodePartitioningProvider446.java
@@ -0,0 +1,30 @@
+/*
+ * 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.gravitino.trino.connector;
+
+import io.trino.spi.connector.ConnectorNodePartitioningProvider;
+
+/** Trino NodePartitioningProvider implementation with the new split bucket
function signature. */
+public class GravitinoNodePartitioningProvider446 extends
GravitinoNodePartitioningProvider {
+
+ public GravitinoNodePartitioningProvider446(
+ ConnectorNodePartitioningProvider nodePartitioningProvider) {
+ super(nodePartitioningProvider);
+ }
+}
diff --git
a/trino-connector/trino-connector-446-451/src/main/java/org/apache/gravitino/trino/connector/GravitinoPlugin446.java
b/trino-connector/trino-connector-446-451/src/main/java/org/apache/gravitino/trino/connector/GravitinoPlugin446.java
new file mode 100644
index 0000000000..14acc884c1
--- /dev/null
+++
b/trino-connector/trino-connector-446-451/src/main/java/org/apache/gravitino/trino/connector/GravitinoPlugin446.java
@@ -0,0 +1,38 @@
+/*
+ * 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.gravitino.trino.connector;
+
+import org.apache.gravitino.client.GravitinoAdminClient;
+
+/** Trino plugin endpoint, using java spi mechanism */
+public class GravitinoPlugin446 extends GravitinoPlugin {
+
+ public GravitinoPlugin446() {
+ super();
+ }
+
+ public GravitinoPlugin446(GravitinoAdminClient client) {
+ super(client);
+ }
+
+ @Override
+ protected GravitinoConnectorFactory
createConnectorFactory(GravitinoAdminClient client) {
+ return new GravitinoConnectorFactory446(client);
+ }
+}
diff --git
a/trino-connector/trino-connector-446-451/src/main/java/org/apache/gravitino/trino/connector/GravitinoSplitManager446.java
b/trino-connector/trino-connector-446-451/src/main/java/org/apache/gravitino/trino/connector/GravitinoSplitManager446.java
new file mode 100644
index 0000000000..7bd0ad3192
--- /dev/null
+++
b/trino-connector/trino-connector-446-451/src/main/java/org/apache/gravitino/trino/connector/GravitinoSplitManager446.java
@@ -0,0 +1,61 @@
+/*
+ * 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.gravitino.trino.connector;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.trino.spi.connector.ConnectorSplit;
+import io.trino.spi.connector.ConnectorSplitManager;
+import io.trino.spi.connector.ConnectorSplitSource;
+
+public class GravitinoSplitManager446 extends GravitinoSplitManager {
+
+ public GravitinoSplitManager446(ConnectorSplitManager internalSplitManager) {
+ super(internalSplitManager);
+ }
+
+ @Override
+ protected ConnectorSplitSource createSplitSource(ConnectorSplitSource
splits) {
+ return new GravitinoSplitSource446(splits);
+ }
+
+ static class GravitinoSplitSource446 extends GravitinoSplitSource {
+
+ GravitinoSplitSource446(ConnectorSplitSource connectorSplitSource) {
+ super(connectorSplitSource);
+ }
+
+ @Override
+ protected ConnectorSplit createSplit(ConnectorSplit split) {
+ return new GravitinoSplit446(split);
+ }
+ }
+
+ public static class GravitinoSplit446 extends GravitinoSplit {
+
+ @JsonCreator
+ public GravitinoSplit446(@JsonProperty(HANDLE_STRING) String handleString)
{
+ super(handleString);
+ }
+
+ public GravitinoSplit446(ConnectorSplit split) {
+ super(split);
+ }
+ }
+}
diff --git
a/trino-connector/trino-connector-446-451/src/main/java/org/apache/gravitino/trino/connector/GravitinoSystemConnector446.java
b/trino-connector/trino-connector-446-451/src/main/java/org/apache/gravitino/trino/connector/GravitinoSystemConnector446.java
new file mode 100644
index 0000000000..5eee4446e7
--- /dev/null
+++
b/trino-connector/trino-connector-446-451/src/main/java/org/apache/gravitino/trino/connector/GravitinoSystemConnector446.java
@@ -0,0 +1,82 @@
+/*
+ * 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.gravitino.trino.connector;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.trino.spi.Page;
+import io.trino.spi.connector.ConnectorPageSource;
+import io.trino.spi.connector.ConnectorPageSourceProvider;
+import io.trino.spi.connector.ConnectorSplit;
+import io.trino.spi.connector.ConnectorSplitManager;
+import io.trino.spi.connector.SchemaTableName;
+import org.apache.gravitino.trino.connector.system.GravitinoSystemConnector;
+import
org.apache.gravitino.trino.connector.system.storedprocedure.GravitinoStoredProcedureFactory;
+
+public class GravitinoSystemConnector446 extends GravitinoSystemConnector {
+
+ public GravitinoSystemConnector446(
+ GravitinoStoredProcedureFactory gravitinoStoredProcedureFactory) {
+ super(gravitinoStoredProcedureFactory);
+ }
+
+ @Override
+ protected ConnectorSplitManager createSplitManager() {
+ return new GravitinoSplitManager446();
+ }
+
+ @Override
+ protected ConnectorPageSourceProvider createPageSourceProvider() {
+ return new DatasourceProvider446();
+ }
+
+ static class DatasourceProvider446 extends DatasourceProvider {
+
+ @Override
+ protected ConnectorPageSource createPageSource(Page page) {
+ return new SystemTablePageSource446(page);
+ }
+ }
+
+ static class GravitinoSplitManager446 extends SplitManager {
+
+ protected ConnectorSplit createSplit(SchemaTableName tableName) {
+ return new Split446(tableName);
+ }
+ }
+
+ static class SystemTablePageSource446 extends SystemTablePageSource {
+
+ public SystemTablePageSource446(Page page) {
+ super(page);
+ }
+
+ public Page getNextPage() {
+ return nextPage();
+ }
+ }
+
+ public static class Split446 extends Split {
+
+ @JsonCreator
+ public Split446(@JsonProperty("tableName") SchemaTableName tableName) {
+ super(tableName);
+ }
+ }
+}
diff --git
a/trino-connector/trino-connector-446-451/src/main/resources/META-INF/services/io.trino.spi.Plugin
b/trino-connector/trino-connector-446-451/src/main/resources/META-INF/services/io.trino.spi.Plugin
new file mode 100644
index 0000000000..0c0ba1291b
--- /dev/null
+++
b/trino-connector/trino-connector-446-451/src/main/resources/META-INF/services/io.trino.spi.Plugin
@@ -0,0 +1,19 @@
+#
+# 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.
+#
+org.apache.gravitino.trino.connector.GravitinoPlugin446
diff --git
a/trino-connector/trino-connector-446-451/src/test/java/TestGravitinoConnector446.java
b/trino-connector/trino-connector-446-451/src/test/java/TestGravitinoConnector446.java
new file mode 100644
index 0000000000..95ca2c9329
--- /dev/null
+++
b/trino-connector/trino-connector-446-451/src/test/java/TestGravitinoConnector446.java
@@ -0,0 +1,61 @@
+/*
+ * 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.
+ */
+
+import static io.trino.testing.TestingSession.testSessionBuilder;
+
+import io.trino.Session;
+import io.trino.testing.DistributedQueryRunner;
+import org.apache.gravitino.client.GravitinoAdminClient;
+import org.apache.gravitino.trino.connector.GravitinoPlugin;
+import org.apache.gravitino.trino.connector.GravitinoPlugin446;
+import org.apache.gravitino.trino.connector.TestGravitinoConnector;
+import
org.apache.gravitino.trino.connector.TestGravitinoConnectorWithMetalakeCatalogName;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Nested;
+
+public class TestGravitinoConnector446 {
+ @Nested
+ class SingleMetalake extends TestGravitinoConnector {
+ @Override
+ protected GravitinoPlugin createGravitinoPlugin(GravitinoAdminClient
client) {
+ return new GravitinoPlugin446(client);
+ }
+
+ @Override
+ protected DistributedQueryRunner createTrinoQueryRunner() throws Exception
{
+ Session session = testSessionBuilder().setCatalog("gravitino").build();
+ return DistributedQueryRunner.builder(session).setWorkerCount(1).build();
+ }
+ }
+
+ @Nested
+ @Disabled
+ class MultiMetalake extends TestGravitinoConnectorWithMetalakeCatalogName {
+ @Override
+ protected GravitinoPlugin createGravitinoPlugin(GravitinoAdminClient
client) {
+ return new GravitinoPlugin446(client);
+ }
+
+ @Override
+ protected DistributedQueryRunner createTrinoQueryRunner() throws Exception
{
+ Session session = testSessionBuilder().setCatalog("gravitino").build();
+ return DistributedQueryRunner.builder(session).setWorkerCount(1).build();
+ }
+ }
+}
diff --git
a/trino-connector/trino-connector/src/main/java/org/apache/gravitino/trino/connector/GravitinoMetadata.java
b/trino-connector/trino-connector/src/main/java/org/apache/gravitino/trino/connector/GravitinoMetadata.java
index 5bd0b0e607..7cf72da146 100644
---
a/trino-connector/trino-connector/src/main/java/org/apache/gravitino/trino/connector/GravitinoMetadata.java
+++
b/trino-connector/trino-connector/src/main/java/org/apache/gravitino/trino/connector/GravitinoMetadata.java
@@ -145,6 +145,8 @@ public abstract class GravitinoMetadata implements
ConnectorMetadata {
catalogConnectorMetadata.getTable(
gravitinoTableHandle.getSchemaName(),
gravitinoTableHandle.getTableName());
return metadataAdapter.getTableMetadata(table);
+ // TODO Add support for retrieving hidden columns from the table; they are
used for query
+ // optimization.
}
@Override
